Better handle errors coming from the HTTP Server

GoXLR-on-Linux · Feb 26, 2024 · 1854be6 · 1854be6
1 parent bb077b5
commit 1854be6
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 11 deletions.
diff --git a/daemon/src/main.rs b/daemon/src/main.rs
@@ -298,7 +298,7 @@ async fn run_utility() -> Result<()> {
     ));
 
     // Run the HTTP Server (if enabled)..
-    let mut http_server: Option<ServerHandle> = None;
+    let mut http_server: Result<Option<ServerHandle>> = Ok(None);
     if http_settings.enabled {
         // Spawn a oneshot channel for managing the HTTP Server
         if http_settings.cors_enabled {
@@ -313,8 +313,8 @@ async fn run_utility() -> Result<()> {
             file_paths.clone(),
         ));
         http_server = httpd_rx.await?;
-        if http_server.is_none() {
-            bail!("Unable to Start HTTP Server");
+        if let Err(e) = http_server {
+            bail!("Unable to Start HTTP Server: {}", e);
         }
     } else {
         warn!("HTTP Server Disabled");
@@ -361,7 +361,7 @@ async fn run_utility() -> Result<()> {
     local_shutdown.recv().await;
     info!("Shutting down daemon");
 
-    if let Some(server) = http_server {
+    if let Ok(Some(server)) = http_server {
         // We only need to Join on the HTTP Server if it exists..
         let _ = join!(
             usb_handle,

diff --git a/daemon/src/servers/http_server.rs b/daemon/src/servers/http_server.rs
@@ -201,7 +201,7 @@ struct AppData {
 
 pub async fn spawn_http_server(
     usb_tx: DeviceSender,
-    handle_tx: Sender<Option<ServerHandle>>,
+    handle_tx: Sender<Result<Option<ServerHandle>>>,
     broadcast_tx: tokio::sync::broadcast::Sender<PatchEvent>,
     settings: HttpSettings,
     file_paths: FilePaths,
@@ -232,24 +232,35 @@ pub async fn spawn_http_server(
     .bind((settings.bind_address.clone(), settings.port));
 
     if let Err(e) = server {
-        warn!("Error Running HTTP Server: {:#?}", e);
+        // Log the Error Message..
+        warn!("Unable to Start HTTP Server: {}", e);
+
+        // Let 'Upstream' know an error has occurred
+        let _ = handle_tx.send(Err(anyhow!(e)));
+
+        // Give up :D
         return;
     }
 
+    // Run the server..
     let server = server.unwrap().run();
     info!(
         "Started GoXLR configuration interface at http://{}:{}/",
         settings.bind_address.as_str(),
         settings.port,
     );
 
-    let _ = handle_tx.send(Some(server.handle()));
+    // Let upstream know we're running..
+    let _ = handle_tx.send(Ok(Some(server.handle())));
 
-    if server.await.is_ok() {
-        info!("HTTP Server Stopped.");
-    } else {
-        warn!("HTTP Server Stopped with Error");
+    // Wait for the server to exit with its reason
+    let result = server.await;
+    if result.is_err() {
+        error!("HTTP Server Stopped with Error: {}", result.err().unwrap());
+        return;
     }
+
+    info!("HTTP Server Stopped.");
 }
 
 #[get("/api/websocket")]