Merge branch 'dev' into federation

[lemmy.git] / server / src / main.rs

diff --git a/server/src/main.rs b/server/src/main.rs
index 9f78d43e234eb534a14c75088b0808abe0c5953e..88d62eb997c9fd374a4a1fc3661257d1f64029a0 100644 (file)
--- a/server/src/main.rs
+++ b/server/src/main.rs
@@ -39,8 +39,6 @@ async fn main() -> Result<(), Error> {
   // Set up websocket server
   let server = ChatServer::startup(pool.clone()).start();
 
-  // TODO: its probably failing because the other instance is not up yet
-  //       need to make a new thread and wait a bit before fetching
   thread::spawn(move || {
     // some work here
     sleep(Duration::from_secs(5));
@@ -59,6 +57,7 @@ async fn main() -> Result<(), Error> {
   // Create Http server with websocket support
   Ok(
     HttpServer::new(move || {
+      let settings = Settings::get();
       App::new()
         .wrap(middleware::Logger::default())
         .data(pool.clone())