diff options
| author | metamuffin <metamuffin@disroot.org> | 2023-08-01 21:52:53 +0200 |
|---|---|---|
| committer | metamuffin <metamuffin@disroot.org> | 2023-08-01 21:52:53 +0200 |
| commit | 6eafafe5297c54aa5cb38790c45ba189b47d755e (patch) | |
| tree | e79428752295c185aed6713f24b1202d2a0a35b3 /server/src/main.rs | |
| parent | ff9060ea0987e29e4d468ff7c9fed7cc7109bf2b (diff) | |
| download | jellything-6eafafe5297c54aa5cb38790c45ba189b47d755e.tar jellything-6eafafe5297c54aa5cb38790c45ba189b47d755e.tar.bz2 jellything-6eafafe5297c54aa5cb38790c45ba189b47d755e.tar.zst | |
remote downloa
Diffstat (limited to 'server/src/main.rs')
| -rw-r--r-- | server/src/main.rs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/server/src/main.rs b/server/src/main.rs index eba9532..341f72b 100644 --- a/server/src/main.rs +++ b/server/src/main.rs @@ -5,19 +5,20 @@ */ #![feature(lazy_cell)] -use config::{load_global_config, GlobalConfig}; +use std::fs::File; use database::Database; +use jellycommon::config::GlobalConfig; use jellyremuxer::RemuxerContext; use once_cell::sync::Lazy; use rocket::launch; use routes::build_rocket; -pub mod config; pub mod database; pub mod import; pub mod routes; -pub static CONF: Lazy<GlobalConfig> = Lazy::new(load_global_config); +pub static CONF: Lazy<GlobalConfig> = + Lazy::new(|| serde_json::from_reader(File::open("data/config.json").unwrap()).unwrap()); #[launch] fn rocket() -> _ { |