1 files changed, 11 insertions, 8 deletions
diff --git a/server/src/main.rs b/server/src/main.rs
index 8ee9f4ef..763f540f 100644
--- a/server/src/main.rs
+++ b/server/src/main.rs
@@ -6,12 +6,13 @@ use actix_web::*;
 use lemmy_server::db::establish_connection;
 use lemmy_server::routes::{federation, feeds, index, nodeinfo, webfinger, websocket};
 use lemmy_server::settings::Settings;
+use std::io;
 
 embed_migrations!();
 
-fn main() {
+#[actix_rt::main]
+async fn main() -> io::Result<()> {
   env_logger::init();
-  let sys = actix::System::new("lemmy");
 
   // Run the migrations from code
   let conn = establish_connection();
@@ -19,6 +20,11 @@ fn main() {
 
   let settings = Settings::get();
 
+  println!(
+    "Starting http server at {}:{}",
+    settings.bind, settings.port
+  );
+
   // Create Http server with websocket support
   HttpServer::new(move || {
     App::new()
@@ -37,10 +43,7 @@ fn main() {
         settings.front_end_dir.to_owned() + "/documentation",
       ))
   })
-  .bind((settings.bind, settings.port))
-  .unwrap()
-  .run();
-
-  println!("Started http server at {}:{}", settings.bind, settings.port);
-  let _ = sys.run();
+  .bind((settings.bind, settings.port))?
+  .run()
+  .await
 }