1 files changed, 8 insertions, 11 deletions
diff --git a/webhook/src/main.rs b/webhook/src/main.rs
index 2daaa4d..3125373 100644
--- a/webhook/src/main.rs
+++ b/webhook/src/main.rs
@@ -1,21 +1,18 @@
 use std::net::ToSocketAddrs;
+mod handle;
+mod config;
 
 use hyper::Server;
 use log::info;
-
-extern crate log;
-pub mod handle;
-pub mod utils;
-
 use handle::MakeSvc;
-use utils::{setup_program, Settings};
+use common::config::Settings;
+use crate::config::Config;
 
 #[tokio::main]
 async fn main() {
-    setup_program("webhook");
-    let config = Settings::new().unwrap();
+    let settings: Settings<Config> = Settings::new("webhook").unwrap();
 
-    let addr = format!("{}:{}", config.server.address, config.server.port)
+    let addr = format!("{}:{}", settings.config.server.address, settings.config.server.port)
         .to_socket_addrs()
         .unwrap()
         .next()
@@ -23,10 +20,10 @@ async fn main() {
 
     info!(
         "Starting server on {}:{}",
-        config.server.address, config.server.port
+        settings.config.server.address, settings.config.server.port
     );
     let server = Server::bind(&addr).serve(MakeSvc {
-        settings: config.clone(),
+        settings: settings.config.clone(),
     });
 
     if let Err(e) = server.await {