Remove `actix_rt` & use standard tokio spawn (#3158)

[lemmy.git] / src / lib.rs

diff --git a/src/lib.rs b/src/lib.rs
index 86cf400b64f103a38ae7d753bcac556e02a66dd7..d919acc057aa29b042e2fbfdbc0dacb8af78a9d4 100644 (file)
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -139,24 +139,23 @@ pub async fn start_lemmy_server() -> Result<(), LemmyError> {
     });
   }
 
+  let settings_bind = settings.clone();
+
   let federation_config = FederationConfig::builder()
     .domain(settings.hostname.clone())
     .app_data(context.clone())
     .client(client.clone())
     .http_fetch_limit(FEDERATION_HTTP_FETCH_LIMIT)
-    .worker_count(local_site.federation_worker_count as usize)
+    .worker_count(settings.worker_count)
+    .retry_count(settings.retry_count)
     .debug(cfg!(debug_assertions))
     .http_signature_compat(true)
     .url_verifier(Box::new(VerifyUrlData(context.pool().clone())))
     .build()
-    .await
-    .expect("configure federation");
+    .await?;
 
   // Create Http server with websocket support
-  let settings_bind = settings.clone();
   HttpServer::new(move || {
-    let context = context.clone();
-
     let cors_config = if cfg!(debug_assertions) {
       Cors::permissive()
     } else {
@@ -173,7 +172,7 @@ pub async fn start_lemmy_server() -> Result<(), LemmyError> {
       ))
       .wrap(cors_config)
       .wrap(TracingLogger::<QuieterRootSpanBuilder>::new())
-      .app_data(Data::new(context))
+      .app_data(Data::new(context.clone()))
       .app_data(Data::new(rate_limit_cell.clone()))
       .wrap(FederationMiddleware::new(federation_config.clone()))
       // The routes