diff options
author | metamuffin <metamuffin@disroot.org> | 2023-08-06 12:52:42 +0200 |
---|---|---|
committer | metamuffin <metamuffin@disroot.org> | 2023-08-06 12:52:42 +0200 |
commit | 8551bf2e34d9543fa41a83fae785ed81d6a6c10f (patch) | |
tree | aaa79d1572b253c35576685945280438fe68f4d4 /server/src/main.rs | |
parent | cd366dfdfad18b38c4e542e6db61ced3929d42f9 (diff) | |
download | jellything-8551bf2e34d9543fa41a83fae785ed81d6a6c10f.tar jellything-8551bf2e34d9543fa41a83fae785ed81d6a6c10f.tar.bz2 jellything-8551bf2e34d9543fa41a83fae785ed81d6a6c10f.tar.zst |
move shared server code to own crate
Diffstat (limited to 'server/src/main.rs')
-rw-r--r-- | server/src/main.rs | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/server/src/main.rs b/server/src/main.rs index b10831f..73d90a4 100644 --- a/server/src/main.rs +++ b/server/src/main.rs @@ -8,29 +8,15 @@ use crate::routes::ui::admin::log::enable_logging; use database::Database; use federation::Federation; -use jellycommon::config::GlobalConfig; +use jellybase::CONF; use jellyremuxer::RemuxerContext; -use once_cell::sync::Lazy; use routes::build_rocket; -use std::fs::File; pub mod database; pub mod federation; pub mod import; pub mod routes; -pub static CONF: Lazy<GlobalConfig> = Lazy::new(|| { - serde_json::from_reader( - File::open( - std::env::args() - .nth(1) - .expect("First argument must specify the config.json to use."), - ) - .unwrap(), - ) - .unwrap() -}); - fn main() { enable_logging(); #[cfg(feature = "bypass-auth")] |