aboutsummaryrefslogtreecommitdiff
path: root/server/src/main.rs
diff options
context:
space:
mode:
authormetamuffin <metamuffin@disroot.org>2023-08-02 23:07:55 +0200
committermetamuffin <metamuffin@disroot.org>2023-08-02 23:07:55 +0200
commit8e33fcdfbd9df042c0cfd8e9a2084993313961c9 (patch)
tree9b18183237177b6c2b7060140ed92e62581ab588 /server/src/main.rs
parentc81d8bbfd46d53fba6e0086b5f859f8af8639f4a (diff)
downloadjellything-8e33fcdfbd9df042c0cfd8e9a2084993313961c9.tar
jellything-8e33fcdfbd9df042c0cfd8e9a2084993313961c9.tar.bz2
jellything-8e33fcdfbd9df042c0cfd8e9a2084993313961c9.tar.zst
federated import works but relies on private data
Diffstat (limited to 'server/src/main.rs')
-rw-r--r--server/src/main.rs13
1 files changed, 11 insertions, 2 deletions
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();
}