aboutsummaryrefslogtreecommitdiff
path: root/server/src/main.rs
diff options
context:
space:
mode:
authormetamuffin <metamuffin@disroot.org>2023-09-29 20:56:36 +0200
committermetamuffin <metamuffin@disroot.org>2023-09-29 20:56:36 +0200
commitc62eb3a2fdaa80f472be6ecbfc2cbf2479d8d914 (patch)
tree7a32678b59c123ea6fbe6c01237aec5e3b143e87 /server/src/main.rs
parent29b12a48bcfa3aa0f814f7b39a64868b6313c13d (diff)
downloadjellything-c62eb3a2fdaa80f472be6ecbfc2cbf2479d8d914.tar
jellything-c62eb3a2fdaa80f472be6ecbfc2cbf2479d8d914.tar.bz2
jellything-c62eb3a2fdaa80f472be6ecbfc2cbf2479d8d914.tar.zst
move stream generation to new crate
Diffstat (limited to 'server/src/main.rs')
-rw-r--r--server/src/main.rs4
1 files changed, 1 insertions, 3 deletions
diff --git a/server/src/main.rs b/server/src/main.rs
index 43b1db4..f2c1440 100644
--- a/server/src/main.rs
+++ b/server/src/main.rs
@@ -10,7 +10,6 @@ use crate::routes::ui::admin::log::enable_logging;
use database::Database;
use federation::Federation;
use jellybase::CONF;
-use jellyremuxer::RemuxerContext;
use log::{error, warn};
use routes::build_rocket;
use tokio::fs::create_dir_all;
@@ -33,14 +32,13 @@ fn main() {
}
async fn async_main() {
create_dir_all(&CONF.cache_path).await.unwrap();
- let remuxer = RemuxerContext::new();
let database = Database::open(&CONF.database_path).unwrap();
let federation = Federation::initialize();
database.create_admin();
// if let Err(err) = import::import(&database, &federation).await {
// log::error!("import not sucessful: {err:?}")
// }
- let r = build_rocket(remuxer, database, federation).launch().await;
+ let r = build_rocket(database, federation).launch().await;
match r {
Ok(_) => warn!("server shutdown"),
Err(e) => error!("server exited: {e}"),