add all in one binary

3 files changed, 57 insertions, 53 deletions

diff --git a/exes/webhook/src/config.rs b/exes/webhook/src/config.rs
index e98de13..56a9b78 100644
--- a/exes/webhook/src/config.rs
+++ b/exes/webhook/src/config.rs
@@ -4,7 +4,7 @@ use ed25519_dalek::PublicKey;
 use serde::{Deserialize, Deserializer};
 
 fn default_listening_address() -> SocketAddr {
-    SocketAddr::V4(SocketAddrV4::new(Ipv4Addr::UNSPECIFIED, 8080))
+    SocketAddr::V4(SocketAddrV4::new(Ipv4Addr::UNSPECIFIED, 8091))
 }
 
 #[derive(Debug, Deserialize, Clone, Copy)]
diff --git a/exes/webhook/src/lib.rs b/exes/webhook/src/lib.rs
new file mode 100644
index 0000000..13a4e60
--- /dev/null
+++ b/exes/webhook/src/lib.rs
@@ -0,0 +1,54 @@
+mod config;
+mod handler;
+use std::{future::Future, pin::Pin};
+
+use crate::{
+    config::WebhookConfig,
+    handler::{handler::WebhookService, make_service::MakeSvc},
+};
+use hyper::Server;
+use leash::{AnyhowResultFuture, Component};
+use shared::{config::Settings, log::info, nats_crate::Client};
+use tokio::sync::oneshot;
+
+#[derive(Clone, Copy)]
+pub struct WebhookServer {}
+
+impl Component for WebhookServer {
+    type Config = WebhookConfig;
+    const SERVICE_NAME: &'static str = "webhook";
+
+    fn start(
+        &self,
+        settings: Settings<Self::Config>,
+        stop: oneshot::Receiver<()>,
+    ) -> AnyhowResultFuture<()> {
+        Box::pin(async move {
+            info!("Starting server on {}", settings.server.listening_adress);
+
+            let bind = settings.server.listening_adress;
+            info!("NAts connected!");
+            let nats =
+                Into::<Pin<Box<dyn Future<Output = anyhow::Result<Client>> + Send>>>::into(settings.nats)
+
+                    .await?;
+
+            let make_service = MakeSvc::new(WebhookService {
+                config: settings.config,
+                nats: nats.clone(),
+            });
+
+            let server = Server::bind(&bind).serve(make_service);
+
+            server.with_graceful_shutdown(async {
+                stop.await.expect("should not fail");
+            }).await?;
+
+            Ok(())
+        })
+    }
+
+    fn new() -> Self {
+        Self {}
+    }
+}
\ No newline at end of file
diff --git a/exes/webhook/src/main.rs b/exes/webhook/src/main.rs
index 0215e51..f531725 100644
--- a/exes/webhook/src/main.rs
+++ b/exes/webhook/src/main.rs
@@ -1,54 +1,4 @@
-mod config;
-mod handler;
-use std::{future::Future, pin::Pin};
-
-use crate::{
-    config::WebhookConfig,
-    handler::{handler::WebhookService, make_service::MakeSvc},
-};
-use hyper::Server;
-use leash::{ignite, AnyhowResultFuture, Component};
-use shared::{config::Settings, log::info, nats_crate::Client};
-use tokio::sync::oneshot;
-
-#[derive(Clone, Copy)]
-struct WebhookServer {}
-
-impl Component for WebhookServer {
-    type Config = WebhookConfig;
-    const SERVICE_NAME: &'static str = "webhook";
-
-    fn start(
-        &self,
-        settings: Settings<Self::Config>,
-        stop: oneshot::Receiver<()>,
-    ) -> AnyhowResultFuture<()> {
-        Box::pin(async move {
-            info!("Starting server on {}", settings.server.listening_adress);
-
-            let bind = settings.server.listening_adress;
-            let nats =
-                Into::<Pin<Box<dyn Future<Output = anyhow::Result<Client>>>>>::into(settings.nats)
-                    .await?;
-
-            let make_service = MakeSvc::new(WebhookService {
-                config: settings.config,
-                nats: nats.clone(),
-            });
-
-            let server = Server::bind(&bind).serve(make_service);
-
-            server.with_graceful_shutdown(async {
-                stop.await.expect("should not fail");
-            }).await?;
-
-            Ok(())
-        })
-    }
-
-    fn new() -> Self {
-        Self {}
-    }
-}
+use leash::ignite;
+use webhook::WebhookServer;
 
 ignite!(WebhookServer);