#[macro_use]
extern crate diesel_migrations;
-use crate::diesel_migrations::MigrationHarness;
use actix::prelude::*;
-use actix_web::{web::Data, *};
-use diesel::{
- r2d2::{ConnectionManager, Pool},
- PgConnection,
-};
+use actix_web::{middleware, web::Data, App, HttpServer, Result};
use diesel_migrations::EmbeddedMigrations;
-use doku::json::{AutoComments, Formatting};
+use doku::json::{AutoComments, CommentsStyle, Formatting, ObjectsStyle};
use lemmy_api::match_websocket_operation;
use lemmy_api_common::{
lemmy_db_views::structs::SiteView,
request::build_user_agent,
utils::{
- blocking,
check_private_instance_and_federation_enabled,
local_site_rate_limit_to_rate_limit_config,
},
+ websocket::chat_server::ChatServer,
+ LemmyContext,
};
use lemmy_api_crud::match_websocket_operation_crud;
-use lemmy_db_schema::{source::secret::Secret, utils::get_database_url_from_env};
+use lemmy_db_schema::{
+ source::secret::Secret,
+ utils::{build_db_pool, get_database_url, run_migrations},
+};
use lemmy_routes::{feeds, images, nodeinfo, webfinger};
use lemmy_server::{
api_routes,
};
use lemmy_utils::{
error::LemmyError,
- rate_limit::{rate_limiter::RateLimiter, RateLimit},
+ rate_limit::RateLimitCell,
settings::{structs::Settings, SETTINGS},
};
-use lemmy_websocket::{chat_server::ChatServer, LemmyContext};
use reqwest::Client;
use reqwest_middleware::ClientBuilder;
use reqwest_retry::{policies::ExponentialBackoff, RetryTransientMiddleware};
use reqwest_tracing::TracingMiddleware;
-use std::{
- env,
- sync::{Arc, Mutex},
- thread,
- time::Duration,
-};
+use std::{env, thread, time::Duration};
use tracing_actix_web::TracingLogger;
pub const MIGRATIONS: EmbeddedMigrations = embed_migrations!();
if args.len() == 2 && args[1] == "--print-config-docs" {
let fmt = Formatting {
auto_comments: AutoComments::none(),
+ comments_style: CommentsStyle {
+ separator: "#".to_owned(),
+ },
+ objects_style: ObjectsStyle {
+ surround_keys_with_quotes: false,
+ use_comma_as_separator: false,
+ },
..Default::default()
};
println!("{}", doku::to_json_fmt_val(&fmt, &Settings::default()));
init_logging(&settings.opentelemetry_url)?;
- // 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)
- .min_idle(Some(1))
- .build(manager)?;
+ // Set up the bb8 connection pool
+ let db_url = get_database_url(Some(&settings));
+ run_migrations(&db_url);
// Run the migrations from code
- let settings_cloned = settings.to_owned();
- blocking(&pool, move |conn| {
- let _ = conn
- .run_pending_migrations(MIGRATIONS)
- .map_err(|_| LemmyError::from_message("Couldn't run migrations"))?;
- run_advanced_migrations(conn, &settings_cloned)?;
- Ok(()) as Result<(), LemmyError>
- })
- .await??;
+ let pool = build_db_pool(&settings).await?;
+ run_advanced_migrations(&pool, &settings).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");
+ scheduled_tasks::setup(db_url).expect("Couldn't set up scheduled_tasks");
});
// Initialize the secrets
- let conn = &mut pool.get()?;
- let secret = Secret::init(conn).expect("Couldn't initialize secrets.");
+ let secret = Secret::init(&pool)
+ .await
+ .expect("Couldn't initialize secrets.");
// Make sure the local site is set up.
- let site_view = SiteView::read_local(conn).expect("local site not set up");
+ let site_view = SiteView::read_local(&pool)
+ .await
+ .expect("local site not set up");
let local_site = site_view.local_site;
let federation_enabled = local_site.federation_enabled;
// Set up the rate limiter
let rate_limit_config =
local_site_rate_limit_to_rate_limit_config(&site_view.local_site_rate_limit);
-
- // TODO this isn't live-updating
- // https://github.com/LemmyNet/lemmy/issues/2508
- let rate_limiter = RateLimit {
- rate_limiter: Arc::new(Mutex::new(RateLimiter::default())),
- rate_limit_config,
- };
+ let rate_limit_cell = RateLimitCell::new(rate_limit_config).await;
println!(
"Starting http server at {}:{}",
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.clone(),
settings.clone(),
secret.clone(),
+ rate_limit_cell.clone(),
)
.start();
HttpServer::new(move || {
let context = LemmyContext::create(
pool.clone(),
- chat_server.to_owned(),
+ chat_server.clone(),
client.clone(),
- settings.to_owned(),
- secret.to_owned(),
+ settings.clone(),
+ secret.clone(),
+ rate_limit_cell.clone(),
);
- let rate_limiter = rate_limiter.clone();
App::new()
- .wrap(actix_web::middleware::Logger::default())
+ .wrap(middleware::Logger::default())
.wrap(TracingLogger::<QuieterRootSpanBuilder>::new())
.app_data(Data::new(context))
- .app_data(Data::new(rate_limiter.clone()))
+ .app_data(Data::new(rate_limit_cell.clone()))
// The routes
- .configure(|cfg| api_routes::config(cfg, &rate_limiter))
+ .configure(|cfg| api_routes::config(cfg, rate_limit_cell))
.configure(|cfg| {
if federation_enabled {
lemmy_apub::http::routes::config(cfg);
}
})
.configure(feeds::config)
- .configure(|cfg| images::config(cfg, pictrs_client.clone(), &rate_limiter))
+ .configure(|cfg| images::config(cfg, pictrs_client.clone(), rate_limit_cell))
.configure(nodeinfo::config)
})
.bind((settings_bind.bind, settings_bind.port))?
projects / lemmy.git / blobdiff