Make functions work with both connection and pool (#3420)

[lemmy.git] / src / prometheus_metrics.rs

diff --git a/src/prometheus_metrics.rs b/src/prometheus_metrics.rs
index 1ff47a54ba9e9e6761612d33389ac5e9bbc272e7..9e0ffde38c425b2b1833cc878a1dbc88c3a9f654 100644 (file)
--- a/src/prometheus_metrics.rs
+++ b/src/prometheus_metrics.rs
@@ -47,7 +47,7 @@ pub fn serve_prometheus(config: Option<&PrometheusConfig>, lemmy_context: LemmyC
           .route("/metrics", web::get().to(metrics))
       })
       .bind((bind, port as u16))
-      .expect(&format!("Cannot bind to {}:{}", bind, port))
+      .unwrap_or_else(|_| panic!("Cannot bind to {}:{}", bind, port))
       .run();
 
       if let Err(err) = server.await {
@@ -103,11 +103,11 @@ fn create_db_pool_metrics() -> DbPoolMetrics {
     .register(Box::new(metrics.available.clone()))
     .unwrap();
 
-  return metrics;
+  metrics
 }
 
 async fn collect_db_pool_metrics(context: &PromContext) {
-  let pool_status = context.lemmy.pool().status();
+  let pool_status = context.lemmy.inner_pool().status();
   context
     .db_pool_metrics
     .max_size