80aef61aed
More fixes - fixed docker builds - fixed mentions regex test - fixed DATABASE_URL stuff - change schema path in diesel.toml Address review comments - add jsonb column back into activity table - remove authors field from cargo.toml - adjust LEMMY_DATABASE_URL env var usage - rename all occurences of LEMMY_DATABASE_URL to DATABASE_URL Decouple utils and db Split code into cargo workspaces Co-authored-by: Felix Ableitner <me@nutomic.com> Reviewed-on: https://yerbamate.dev/LemmyNet/lemmy/pulls/67
135 lines
3.6 KiB
Rust
135 lines
3.6 KiB
Rust
extern crate lemmy_server;
|
|
#[macro_use]
|
|
extern crate diesel_migrations;
|
|
#[macro_use]
|
|
pub extern crate lazy_static;
|
|
|
|
pub type DbPool = Pool<ConnectionManager<PgConnection>>;
|
|
|
|
use crate::lemmy_server::actix_web::dev::Service;
|
|
use actix::prelude::*;
|
|
use actix_web::{
|
|
body::Body,
|
|
client::Client,
|
|
dev::{ServiceRequest, ServiceResponse},
|
|
http::{
|
|
header::{CACHE_CONTROL, CONTENT_TYPE},
|
|
HeaderValue,
|
|
},
|
|
*,
|
|
};
|
|
use diesel::{
|
|
r2d2::{ConnectionManager, Pool},
|
|
PgConnection,
|
|
};
|
|
use lemmy_db::get_database_url_from_env;
|
|
use lemmy_server::{
|
|
blocking,
|
|
code_migrations::run_advanced_migrations,
|
|
rate_limit::{rate_limiter::RateLimiter, RateLimit},
|
|
routes::{api, federation, feeds, index, nodeinfo, webfinger},
|
|
websocket::server::*,
|
|
LemmyError,
|
|
};
|
|
use lemmy_utils::{settings::Settings, CACHE_CONTROL_REGEX};
|
|
use std::sync::Arc;
|
|
use tokio::sync::Mutex;
|
|
|
|
lazy_static! {
|
|
// static ref CACHE_CONTROL_VALUE: String = format!("public, max-age={}", 365 * 24 * 60 * 60);
|
|
// Test out 1 hour here, this is breaking some things
|
|
static ref CACHE_CONTROL_VALUE: String = format!("public, max-age={}", 60 * 60);
|
|
}
|
|
|
|
embed_migrations!();
|
|
|
|
#[actix_rt::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??;
|
|
|
|
// Set up the rate limiter
|
|
let rate_limiter = RateLimit {
|
|
rate_limiter: Arc::new(Mutex::new(RateLimiter::default())),
|
|
};
|
|
|
|
// Set up websocket server
|
|
let server = ChatServer::startup(pool.clone(), rate_limiter.clone(), Client::default()).start();
|
|
|
|
println!(
|
|
"Starting http server at {}:{}",
|
|
settings.bind, settings.port
|
|
);
|
|
|
|
// Create Http server with websocket support
|
|
HttpServer::new(move || {
|
|
let settings = Settings::get();
|
|
let rate_limiter = rate_limiter.clone();
|
|
App::new()
|
|
.wrap_fn(add_cache_headers)
|
|
.wrap(middleware::Logger::default())
|
|
.data(pool.clone())
|
|
.data(server.clone())
|
|
.data(Client::default())
|
|
// The routes
|
|
.configure(move |cfg| api::config(cfg, &rate_limiter))
|
|
.configure(federation::config)
|
|
.configure(feeds::config)
|
|
.configure(index::config)
|
|
.configure(nodeinfo::config)
|
|
.configure(webfinger::config)
|
|
// static files
|
|
.service(actix_files::Files::new(
|
|
"/static",
|
|
settings.front_end_dir.to_owned(),
|
|
))
|
|
.service(actix_files::Files::new(
|
|
"/docs",
|
|
settings.front_end_dir + "/documentation",
|
|
))
|
|
})
|
|
.bind((settings.bind, settings.port))?
|
|
.run()
|
|
.await?;
|
|
|
|
Ok(())
|
|
}
|
|
|
|
fn add_cache_headers<S>(
|
|
req: ServiceRequest,
|
|
srv: &mut S,
|
|
) -> impl Future<Output = Result<ServiceResponse, Error>>
|
|
where
|
|
S: Service<Request = ServiceRequest, Response = ServiceResponse<Body>, Error = Error>,
|
|
{
|
|
let fut = srv.call(req);
|
|
async move {
|
|
let mut res = fut.await?;
|
|
if let Some(content_type) = res.headers().get(CONTENT_TYPE) {
|
|
if CACHE_CONTROL_REGEX.is_match(content_type.to_str().unwrap()) {
|
|
let header_val = HeaderValue::from_static(&CACHE_CONTROL_VALUE);
|
|
res.headers_mut().insert(CACHE_CONTROL, header_val);
|
|
}
|
|
}
|
|
Ok(res)
|
|
}
|
|
}
|