merge branch management

1 files changed, 17 insertions, 10 deletions

diff --git a/webhook/src/main.rs b/webhook/src/main.rs
index c127c2c..98e5f13 100644
--- a/webhook/src/main.rs
+++ b/webhook/src/main.rs
@@ -1,30 +1,37 @@
 use std::{net::ToSocketAddrs, sync::Arc};

-mod handler;

 mod config;

+mod handler;

 use crate::handler::make_service::MakeSvc;

 

-use hyper::Server;

-use log::{info, error};

-use common::config::Settings;

 use crate::config::Config;

+use common::config::Settings;

+use common::log::{error, info};

+use hyper::Server;

 

 #[tokio::main]

 async fn main() {

     let settings: Settings<Config> = Settings::new("webhook").unwrap();

+    start(settings).await;

+}

 

-    let addr = format!("{}:{}", settings.config.server.address, settings.config.server.port)

-        .to_socket_addrs()

-        .unwrap()

-        .next()

-        .unwrap();

+async fn start(settings: Settings<Config>) {

+    let addr = format!(

+        "{}:{}",

+        settings.config.server.address, settings.config.server.port

+    )

+    .to_socket_addrs()

+    .unwrap()

+    .next()

+    .unwrap();

 

     info!(

         "Starting server on {}:{}",

         settings.config.server.address, settings.config.server.port

     );

 

+    let config = Arc::new(settings.config);

     let server = Server::bind(&addr).serve(MakeSvc {

-        settings: settings.config.clone(),

+        settings: config,

         nats: Arc::new(settings.nats.into()),

     });