Cache & Optimize Woodpecker CI (#3450)

[lemmy.git] / src / lib.rs

diff --git a/src/lib.rs b/src/lib.rs
index 9e081376f8b4a574e23e79f277bba1f1bd96bef1..55bb91606341cdbfb8c4747cea93a884108c97fc 100644 (file)
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -75,15 +75,15 @@ pub async fn start_lemmy_server() -> Result<(), LemmyError> {
   let pool = build_db_pool(&settings).await?;
 
   // Run the Code-required migrations
-  run_advanced_migrations(&pool, &settings).await?;
+  run_advanced_migrations(&mut (&pool).into(), &settings).await?;
 
   // Initialize the secrets
-  let secret = Secret::init(&pool)
+  let secret = Secret::init(&mut (&pool).into())
     .await
     .expect("Couldn't initialize secrets.");
 
   // Make sure the local site is set up.
-  let site_view = SiteView::read_local(&pool)
+  let site_view = SiteView::read_local(&mut (&pool).into())
     .await
     .expect("local site not set up");
   let local_site = site_view.local_site;
@@ -153,7 +153,7 @@ pub async fn start_lemmy_server() -> Result<(), LemmyError> {
     .retry_count(settings.retry_count)
     .debug(*SYNCHRONOUS_FEDERATION)
     .http_signature_compat(true)
-    .url_verifier(Box::new(VerifyUrlData(context.pool().clone())))
+    .url_verifier(Box::new(VerifyUrlData(context.inner_pool().clone())))
     .build()
     .await?;
 
@@ -163,7 +163,7 @@ pub async fn start_lemmy_server() -> Result<(), LemmyError> {
   let prom_api_metrics = PrometheusMetricsBuilder::new("lemmy_api")
     .registry(default_registry().clone())
     .build()
-    .unwrap();
+    .expect("Should always be buildable");
 
   // Create Http server with websocket support
   HttpServer::new(move || {