improve: change loop to thread join

luftaquila · May 16, 2024 · a61c0e3 · a61c0e3
1 parent 8b2a427
commit a61c0e3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/bin/transistor-server.rs b/src/bin/transistor-server.rs
@@ -12,7 +12,5 @@ fn main() -> Result<(), Error> {
 
     server.start(client_config);
 
-    loop {}
-
     Ok(())
 }
diff --git a/src/server.rs b/src/server.rs
@@ -86,7 +86,7 @@ impl Server {
         let disp_ids = self.disp_ids.clone();
 
         /* spawn tcp handler thread */
-        thread::spawn(move || {
+        let thread = thread::spawn(move || {
             handle_client(current, clients, displays, disp_ids, authorized, tx1, rx1);
         });
 
@@ -204,6 +204,10 @@ impl Server {
         if let Err(e) = hook {
             eprintln!("[ERR] event hook failed: {}", e);
         }
+
+        if let Err(e) = thread.join() {
+            eprintln!("[ERR] transceiver thread panicked: {:?}", e);
+        }
     }
 }