Merge branch 'main' into Cleaned-up-most-warnings

server/src/main.rs

@@ -22,17 +22,23 @@
 //           Caznix                                                            //
 // License: Apache-2.0                                                         //
 //=============================================================================//
-static CTRL_C_HANDLER: Once = Once::new();
+
 use std::sync::Once;
 use once_cell::sync::Lazy;
 use splash::splash;
 use anyhow::{Context, Result};
+
 use horizon_logger::{HorizonLogger, log_info};
 
-mod server;
+
+
+
+modserver;
 mod splash;
 // mod collision;
 
+static CTRL_C_HANDLER: Once = Once::new();
+
 //------------------------------------------------------------------------------
 // Global Logger Configuration
 //------------------------------------------------------------------------------
@@ -50,14 +56,13 @@ async fn main() -> Result<()> {
 
     splash();
     let config_init_time = std::time::Instant::now();
-    //let server_config: std::sync::Arc<server::config::ServerConfig> = server_config().context("Failed to obtain server config")?;
     log_info!(LOGGER, "INIT", "Server config loaded in {:#?}", config_init_time.elapsed());
 
     let init_time = std::time::Instant::now();
 
     // Start the server
     server::start().await.context("Failed to start server")?;
-
+    println!("Server started in {:#?}", init_time.elapsed());
 
     let mut terminating: bool = false;
 
@@ -71,9 +76,8 @@ async fn main() -> Result<()> {
                 std::process::exit(0);
 
             }
-        },
-
-    ).expect("Failed to handle Ctrl+C");
+        })
+        .expect("Failed to register ctrl+c handler");
     });
     Ok(())
 }