Add some more logs, configure dependencies and make certain variables be loaded at comp-time
This commit is contained in:
@@ -9,9 +9,9 @@ axum = { version = "0.7.5", features = ["multipart"] }
|
||||
serde = { version = "1.0.210", features = ["derive"] }
|
||||
steam-openid = "0.2.0"
|
||||
time = { version = "0.3.36", features = ["formatting", "parsing"] }
|
||||
tokio = { version = "1.40.0", features = ["rt", "macros", "net", "mio"] }
|
||||
tokio = { version = "1.40.0", features = ["rt", "macros", "net", "mio", "rt-multi-thread"] }
|
||||
tower-sessions = "0.13.0"
|
||||
tower-http = { version = "0.5", features = ["fs"] }
|
||||
tower-http = { version = "0.6", features = ["fs"] }
|
||||
tracing = { version = "0.1.40", features = ["async-await"] }
|
||||
tracing-subscriber = "0.3.18"
|
||||
futures-util = "0.3"
|
||||
@@ -21,7 +21,7 @@ diesel-async = { version = "0.5", features = ["postgres"] }
|
||||
serde_json = "1.0.128"
|
||||
diesel_async_migrations = { version = "0.15" }
|
||||
|
||||
reqwest = { version = "0.12", features = ["json"] }
|
||||
reqwest = { version = "0.12", default-features = false, features = ["rustls-tls", "charset", "json"] }
|
||||
|
||||
common = { path = "../common/" }
|
||||
analysis = { path = "../analysis/" }
|
||||
|
||||
@@ -61,6 +61,9 @@ pub async fn run_api(
|
||||
tokio::fs::create_dir_all(&upload_folder).await.unwrap();
|
||||
}
|
||||
|
||||
let serve_dir = option_env!("FRONTEND_DIST_DIR").unwrap_or("../frontend/dist/");
|
||||
tracing::debug!("Serving static files from {:?}", serve_dir);
|
||||
|
||||
let router = axum::Router::new()
|
||||
.nest(
|
||||
"/api/",
|
||||
@@ -75,10 +78,13 @@ pub async fn run_api(
|
||||
.layer(session_layer)
|
||||
.nest_service(
|
||||
"/",
|
||||
tower_http::services::ServeDir::new("../frontend/dist/"),
|
||||
tower_http::services::ServeDir::new(serve_dir),
|
||||
);
|
||||
|
||||
let listener = tokio::net::TcpListener::bind("0.0.0.0:3000").await.unwrap();
|
||||
let listen_addr = std::net::SocketAddr::new(std::net::IpAddr::V4(std::net::Ipv4Addr::new(0, 0, 0, 0)), 3000);
|
||||
tracing::info!("Listening on Addr: {:?}", listen_addr);
|
||||
|
||||
let listener = tokio::net::TcpListener::bind(listen_addr).await.unwrap();
|
||||
axum::serve(listener, router).await.unwrap();
|
||||
}
|
||||
|
||||
|
||||
@@ -19,7 +19,7 @@ struct CliArgs {
|
||||
analysis: bool,
|
||||
}
|
||||
|
||||
#[tokio::main(flavor = "current_thread")]
|
||||
#[tokio::main(flavor = "multi_thread")]
|
||||
async fn main() {
|
||||
use clap::Parser;
|
||||
|
||||
@@ -41,7 +41,10 @@ async fn main() {
|
||||
|
||||
let mut component_set = tokio::task::JoinSet::new();
|
||||
|
||||
tracing::info!("Starting modules");
|
||||
if args.api {
|
||||
tracing::info!("Enabled API module");
|
||||
|
||||
let steam_api_key = match std::env::var("STEAM_API_KEY") {
|
||||
Ok(s) => s,
|
||||
Err(e) => {
|
||||
@@ -53,8 +56,11 @@ async fn main() {
|
||||
component_set.spawn(backend::run_api(args.upload_folder.clone(), steam_api_key));
|
||||
}
|
||||
if args.analysis {
|
||||
tracing::info!("Enabled Analysis module");
|
||||
|
||||
component_set.spawn(backend::run_analysis(args.upload_folder.clone()));
|
||||
}
|
||||
tracing::info!("Started modules");
|
||||
|
||||
component_set.join_all().await;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user