Fix wrong SMTP port when TLS is being used (fixes #3574) (#3607)

[lemmy.git] / src / main.rs

diff --git a/src/main.rs b/src/main.rs
index 5b8a7ec1d1bf2ee7f6e88a0007bca6f3ecd9169e..5fc03ed025d28c567878dad7b8882497f618906a 100644 (file)
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,105 +1,41 @@
-#[macro_use]
-extern crate diesel_migrations;
-
-use actix::prelude::*;
-use actix_web::*;
-use diesel::{
-  r2d2::{ConnectionManager, Pool},
-  PgConnection,
-};
-use lemmy_api::match_websocket_operation;
-use lemmy_api_common::blocking;
-use lemmy_api_crud::match_websocket_operation_crud;
-use lemmy_apub::activity_queue::create_activity_queue;
-use lemmy_db_queries::get_database_url_from_env;
-use lemmy_routes::{feeds, images, nodeinfo, webfinger};
-use lemmy_server::{api_routes, code_migrations::run_advanced_migrations, scheduled_tasks};
-use lemmy_utils::{
-  rate_limit::{rate_limiter::RateLimiter, RateLimit},
-  settings::structs::Settings,
-  LemmyError,
-};
-use lemmy_websocket::{chat_server::ChatServer, LemmyContext};
-use reqwest::Client;
-use std::{sync::Arc, thread};
-use tokio::sync::Mutex;
-
-embed_migrations!();
-
-#[actix_web::main]
-async fn main() -> Result<(), LemmyError> {
-  env_logger::init();
-  let settings = Settings::get();
-
-  // Set up the r2d2 connection pool
-  let db_url = match get_database_url_from_env() {
-    Ok(url) => url,
-    Err(_) => settings.get_database_url(),
-  };
-  let manager = ConnectionManager::<PgConnection>::new(&db_url);
-  let pool = Pool::builder()
-    .max_size(settings.database().pool_size)
-    .build(manager)
-    .unwrap_or_else(|_| panic!("Error connecting to {}", db_url));
-
-  // Run the migrations from code
-  blocking(&pool, move |conn| {
-    embedded_migrations::run(conn)?;
-    run_advanced_migrations(conn)?;
-    Ok(()) as Result<(), LemmyError>
-  })
-  .await??;
-
-  let pool2 = pool.clone();
-  thread::spawn(move || {
-    scheduled_tasks::setup(pool2);
-  });
-
-  // Set up the rate limiter
-  let rate_limiter = RateLimit {
-    rate_limiter: Arc::new(Mutex::new(RateLimiter::default())),
-  };
-
-  println!(
-    "Starting http server at {}:{}",
-    settings.bind(),
-    settings.port()
-  );
-
-  let activity_queue = create_activity_queue();
-  let chat_server = ChatServer::startup(
-    pool.clone(),
-    rate_limiter.clone(),
-    |c, i, o, d| Box::pin(match_websocket_operation(c, i, o, d)),
-    |c, i, o, d| Box::pin(match_websocket_operation_crud(c, i, o, d)),
-    Client::default(),
-    activity_queue.clone(),
-  )
-  .start();
-
-  // Create Http server with websocket support
-  HttpServer::new(move || {
-    let context = LemmyContext::create(
-      pool.clone(),
-      chat_server.to_owned(),
-      Client::default(),
-      activity_queue.to_owned(),
-    );
-    let rate_limiter = rate_limiter.clone();
-    App::new()
-      .wrap(middleware::Logger::default())
-      .data(context)
-      // The routes
-      .configure(|cfg| api_routes::config(cfg, &rate_limiter))
-      .configure(lemmy_apub_receive::routes::config)
-      .configure(feeds::config)
-      .configure(|cfg| images::config(cfg, &rate_limiter))
-      .configure(nodeinfo::config)
-      .configure(webfinger::config)
-  })
-  .bind((settings.bind(), settings.port()))?
-  .run()
-  .await?;
-
+use lemmy_server::{init_logging, start_lemmy_server};
+use lemmy_utils::{error::LemmyError, settings::SETTINGS};
+
+#[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": pictrs_address
+        },
+        "old_db": {
+            "path": "./pictrs/old"
+        },
+        "repo": {
+            "type": "sled",
+            "path": "./pictrs/sled-repo"
+        },
+        "store": {
+            "type": "filesystem",
+            "path": "./pictrs/files"
+        }
+    }))
+    .init::<&str>(None)
+    .expect("initialize pictrs config");
+    let (lemmy, pictrs) = tokio::join!(start_lemmy_server(), pict_rs::run());
+    lemmy?;
+    pictrs.expect("run pictrs");
+  }
   Ok(())
 }