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

[lemmy.git] / src / main.rs

diff --git a/src/main.rs b/src/main.rs
index 79a813c522ac9449dbba719ba5ceb6f31641fbff..5fc03ed025d28c567878dad7b8882497f618906a 100644 (file)
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,16 +1,23 @@
 use lemmy_server::{init_logging, start_lemmy_server};
 use lemmy_utils::{error::LemmyError, settings::SETTINGS};
 
-#[actix_web::main]
+#[tokio::main]
 pub async fn main() -> Result<(), LemmyError> {
   init_logging(&SETTINGS.opentelemetry_url)?;
   #[cfg(not(feature = "embed-pictrs"))]
   start_lemmy_server().await?;
   #[cfg(feature = "embed-pictrs")]
   {
+    let pictrs_port = &SETTINGS
+      .pictrs_config()
+      .unwrap_or_default()
+      .url
+      .port()
+      .unwrap_or(8080);
+    let pictrs_address = ["127.0.0.1", &pictrs_port.to_string()].join(":");
     pict_rs::ConfigSource::memory(serde_json::json!({
         "server": {
-            "address": "127.0.0.1:8080"
+            "address": pictrs_address
         },
         "old_db": {
             "path": "./pictrs/old"