Add Modlog Filters (#2313)

[lemmy.git] / src / main.rs

diff --git a/src/main.rs b/src/main.rs
index c5e777b1d0f98d53878f41aee6b15d0868fcb4aa..07be683e9c574b71e40b53d16c53485d1b12c8f6 100644 (file)
--- a/src/main.rs
+++ b/src/main.rs
@@ -9,31 +9,43 @@ use diesel::{
 };
 use doku::json::{AutoComments, Formatting};
 use lemmy_api::match_websocket_operation;
-use lemmy_api_common::blocking;
+use lemmy_api_common::{
+  request::build_user_agent,
+  utils::{blocking, check_private_instance_and_federation_enabled},
+};
 use lemmy_api_crud::match_websocket_operation_crud;
-use lemmy_apub_lib::activity_queue::create_activity_queue;
-use lemmy_db_schema::{get_database_url_from_env, source::secret::Secret};
+use lemmy_db_schema::{source::secret::Secret, utils::get_database_url_from_env};
 use lemmy_routes::{feeds, images, nodeinfo, webfinger};
 use lemmy_server::{
   api_routes,
   code_migrations::run_advanced_migrations,
-  init_tracing,
+  init_logging,
+  root_span_builder::QuieterRootSpanBuilder,
   scheduled_tasks,
 };
 use lemmy_utils::{
+  error::LemmyError,
   rate_limit::{rate_limiter::RateLimiter, RateLimit},
-  request::build_user_agent,
-  settings::structs::Settings,
-  LemmyError,
+  settings::{structs::Settings, SETTINGS},
 };
 use lemmy_websocket::{chat_server::ChatServer, LemmyContext};
 use reqwest::Client;
-use std::{env, sync::Arc, thread};
-use tokio::sync::Mutex;
+use reqwest_middleware::ClientBuilder;
+use reqwest_retry::{policies::ExponentialBackoff, RetryTransientMiddleware};
+use reqwest_tracing::TracingMiddleware;
+use std::{
+  env,
+  sync::{Arc, Mutex},
+  thread,
+  time::Duration,
+};
 use tracing_actix_web::TracingLogger;
 
 embed_migrations!();
 
+/// Max timeout for http requests
+pub const REQWEST_TIMEOUT: Duration = Duration::from_secs(10);
+
 #[actix_web::main]
 async fn main() -> Result<(), LemmyError> {
   let args: Vec<String> = env::args().collect();
@@ -46,9 +58,9 @@ async fn main() -> Result<(), LemmyError> {
     return Ok(());
   }
 
-  init_tracing()?;
+  let settings = SETTINGS.to_owned();
 
-  let settings = Settings::init().expect("Couldn't initialize settings.");
+  init_logging(&settings.opentelemetry_url)?;
 
   // Set up the r2d2 connection pool
   let db_url = match get_database_url_from_env() {
@@ -58,6 +70,7 @@ async fn main() -> Result<(), LemmyError> {
   let manager = ConnectionManager::<PgConnection>::new(&db_url);
   let pool = Pool::builder()
     .max_size(settings.database.pool_size)
+    .min_idle(Some(1))
     .build(manager)
     .unwrap_or_else(|_| panic!("Error connecting to {}", db_url));
 
@@ -70,6 +83,7 @@ async fn main() -> Result<(), LemmyError> {
   })
   .await??;
 
+  // Schedules various cleanup tasks for the DB
   let pool2 = pool.clone();
   thread::spawn(move || {
     scheduled_tasks::setup(pool2).expect("Couldn't set up scheduled_tasks");
@@ -90,11 +104,29 @@ async fn main() -> Result<(), LemmyError> {
     settings.bind, settings.port
   );
 
-  let client = Client::builder()
+  let reqwest_client = Client::builder()
     .user_agent(build_user_agent(&settings))
+    .timeout(REQWEST_TIMEOUT)
     .build()?;
 
-  let activity_queue = create_activity_queue();
+  let retry_policy = ExponentialBackoff {
+    max_n_retries: 3,
+    max_retry_interval: REQWEST_TIMEOUT,
+    min_retry_interval: Duration::from_millis(100),
+    backoff_exponent: 2,
+  };
+
+  let client = ClientBuilder::new(reqwest_client.clone())
+    .with(TracingMiddleware)
+    .with(RetryTransientMiddleware::new_with_policy(retry_policy))
+    .build();
+
+  // Pictrs cannot use the retry middleware
+  let pictrs_client = ClientBuilder::new(reqwest_client.clone())
+    .with(TracingMiddleware)
+    .build();
+
+  check_private_instance_and_federation_enabled(&pool, &settings).await?;
 
   let chat_server = ChatServer::startup(
     pool.clone(),
@@ -102,7 +134,6 @@ async fn main() -> Result<(), LemmyError> {
     |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.clone(),
-    activity_queue.clone(),
     settings.clone(),
     secret.clone(),
   )
@@ -115,19 +146,20 @@ async fn main() -> Result<(), LemmyError> {
       pool.clone(),
       chat_server.to_owned(),
       client.clone(),
-      activity_queue.to_owned(),
       settings.to_owned(),
       secret.to_owned(),
     );
     let rate_limiter = rate_limiter.clone();
     App::new()
-      .wrap(TracingLogger::default())
+      .wrap(actix_web::middleware::Logger::default())
+      .wrap(TracingLogger::<QuieterRootSpanBuilder>::new())
       .app_data(Data::new(context))
+      .app_data(Data::new(rate_limiter.clone()))
       // The routes
       .configure(|cfg| api_routes::config(cfg, &rate_limiter))
       .configure(|cfg| lemmy_apub::http::routes::config(cfg, &settings))
       .configure(feeds::config)
-      .configure(|cfg| images::config(cfg, &rate_limiter))
+      .configure(|cfg| images::config(cfg, pictrs_client.clone(), &rate_limiter))
       .configure(nodeinfo::config)
       .configure(|cfg| webfinger::config(cfg, &settings))
   })