From 023a40aba0473191c5ce5379b0a78fec18b43bc0 Mon Sep 17 00:00:00 2001
From: Eduardo Trujillo <ed@chromabits.com>
Date: Mon, 14 Nov 2022 23:14:29 -0800
Subject: [PATCH] refactor(server): Handle blocking errors

---
 src/server.rs | 8 +-------
 src/stats.rs  | 2 +-
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/server.rs b/src/server.rs
index 404d592..98996b4 100644
--- a/src/server.rs
+++ b/src/server.rs
@@ -108,17 +108,11 @@ impl Server {
 
       let _ = tx.send(srv.handle());
 
-      rt.block_on(async { srv.await });
+      rt.block_on(async { srv.await }).context(SystemRun)?;
 
       Ok(())
-
-      //log::debug!("Starting server event loop");
-
-      //sys.run().context(SystemRun)
     });
 
-    log::debug!("!!!!!!!!!!!!!!!!!!!!!!!!!!!");
-
     Ok((
       rx.recv().context(ChannelReceive)?,
       join_handle,
diff --git a/src/stats.rs b/src/stats.rs
index ffac896..835fe1b 100644
--- a/src/stats.rs
+++ b/src/stats.rs
@@ -70,7 +70,7 @@ impl StatsServer {
 
       rt.block_on(async {
         srv.await
-      });
+      }).context(SystemRun)?;
 
       Ok(())
     });
-- 
GitLab