1 files changed, 11 insertions, 6 deletions

diff --git a/src/main.rs b/src/main.rs
index 33d3188..9ec5af0 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,11 +1,15 @@
 mod bayou;
+mod command;
 mod config;
 mod cryptoblob;
 mod lmtp;
 mod login;
-mod mail_uuid;
+mod mail_ident;
 mod mailbox;
+mod mailstore;
 mod server;
+mod service;
+mod session;
 mod time;
 mod uidindex;
 
@@ -118,9 +122,10 @@ struct UserSecretsArgs {
 #[tokio::main]
 async fn main() -> Result<()> {
     if std::env::var("RUST_LOG").is_err() {
-        std::env::set_var("RUST_LOG", "mailrage=info,k2v_client=info")
+        std::env::set_var("RUST_LOG", "main=info,mailrage=info,k2v_client=info")
     }
-    pretty_env_logger::init();
+
+    tracing_subscriber::fmt::init();
 
     let args = Args::parse();
 
@@ -128,14 +133,14 @@ async fn main() -> Result<()> {
         Command::Server { config_file } => {
             let config = read_config(config_file)?;
 
-            let server = Server::new(config)?;
+            let server = Server::new(config).await?;
             server.run().await?;
         }
         Command::Test { config_file } => {
             let config = read_config(config_file)?;
 
-            let server = Server::new(config)?;
-            server.test().await?;
+            let server = Server::new(config).await?;
+            //server.test().await?;
         }
         Command::FirstLogin {
             creds,