From 8e33fcdfbd9df042c0cfd8e9a2084993313961c9 Mon Sep 17 00:00:00 2001 From: metamuffin Date: Wed, 2 Aug 2023 23:07:55 +0200 Subject: federated import works but relies on private data --- server/src/main.rs | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'server/src/main.rs') diff --git a/server/src/main.rs b/server/src/main.rs index 5b2d070..6a75c30 100644 --- a/server/src/main.rs +++ b/server/src/main.rs @@ -6,13 +6,16 @@ #![feature(lazy_cell)] use database::Database; +use federation::Federation; use jellycommon::config::GlobalConfig; use jellyremuxer::RemuxerContext; +use log::error; 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; @@ -37,7 +40,13 @@ fn main() { async fn async_main() { let remuxer = RemuxerContext::new(); let database = Database::open(&CONF.database_path).unwrap(); - import::import(&database).await.unwrap(); + let federation = Federation::initialize(); database.create_admin(); - build_rocket(remuxer, database).launch().await.unwrap(); + if let Err(err) = import::import(&database, &federation).await { + error!("import not sucessful: {err:?}") + } + build_rocket(remuxer, database, federation) + .launch() + .await + .unwrap(); } -- cgit v1.2.3-70-g09d2