Fix missing return statement in beacon loop.

This also improves the debug logging with log statements when the loops have been ended.
chirpstack · Sep 7, 2020 · eea5738 · eea5738
1 parent 64f48c0
commit eea5738
Show file tree

Hide file tree

Showing 16 changed files with 49 additions and 19 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/chirpstack-concentratord-sx1301/Cargo.toml b/chirpstack-concentratord-sx1301/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "chirpstack-concentratord-sx1301"
-version = "3.0.0"
+version = "3.0.1"
 authors = ["Orne Brocaar <[email protected]>"]
 edition = "2018"
 publish = false

diff --git a/chirpstack-concentratord-sx1301/src/handler/beacon.rs b/chirpstack-concentratord-sx1301/src/handler/beacon.rs
@@ -27,6 +27,7 @@ pub fn beacon_loop(
         match stop_receive.recv_timeout(MARGIN) {
             Ok(v) => {
                 debug!("Received stop signal, signal: {}", v);
+                break;
             }
             _ => {}
         };
@@ -52,6 +53,7 @@ pub fn beacon_loop(
         match stop_receive.recv_timeout(sleep_time) {
             Ok(v) => {
                 debug!("Received stop signal, signal: {}", v);
+                break;
             }
             _ => {}
         };
@@ -64,6 +66,8 @@ pub fn beacon_loop(
             Err(err) => warn!("Enqueue beacon failed, error: {}", err),
         }
     }
+
+    debug!("Beacon loop ended");
 }
 
 fn send_beacon(

diff --git a/chirpstack-concentratord-sx1301/src/handler/command.rs b/chirpstack-concentratord-sx1301/src/handler/command.rs
@@ -28,7 +28,7 @@ pub fn handle_loop(
         match stop_receive.recv_timeout(Duration::from_millis(0)) {
             Ok(v) => {
                 debug!("Received stop signal, signal: {}", v);
-                return;
+                break;
             }
             _ => {}
         };
@@ -62,6 +62,8 @@ pub fn handle_loop(
 
         rep_sock.send(resp, 0).unwrap();
     }
+
+    debug!("Command loop ended");
 }
 
 fn handle_downlink(

diff --git a/chirpstack-concentratord-sx1301/src/handler/gps.rs b/chirpstack-concentratord-sx1301/src/handler/gps.rs
@@ -45,7 +45,7 @@ pub fn gps_loop(gps_tty_path: &str, stop_receive: Receiver<Signal>) {
         match stop_receive.recv_timeout(Duration::from_millis(0)) {
             Ok(v) => {
                 debug!("Received stop signal, signal: {}", v);
-                return;
+                break;
             }
             _ => {}
         };
@@ -112,6 +112,8 @@ pub fn gps_loop(gps_tty_path: &str, stop_receive: Receiver<Signal>) {
             }
         }
     }
+
+    debug!("GPS loop ended");
 }
 
 pub fn gps_validate_loop(stop_receive: Receiver<Signal>) {
@@ -126,7 +128,7 @@ pub fn gps_validate_loop(stop_receive: Receiver<Signal>) {
         match stop_receive.recv_timeout(Duration::from_secs(1)) {
             Ok(v) => {
                 debug!("Received stop signal, signal: {}", v);
-                return;
+                break;
             }
             _ => {}
         };
@@ -196,6 +198,8 @@ pub fn gps_validate_loop(stop_receive: Receiver<Signal>) {
             }
         }
     }
+
+    debug!("GPS validation loop ended");
 }
 
 pub fn cnt2time(count_us: u32) -> Result<SystemTime, String> {

diff --git a/chirpstack-concentratord-sx1301/src/handler/jit.rs b/chirpstack-concentratord-sx1301/src/handler/jit.rs
@@ -23,7 +23,7 @@ pub fn jit_loop(
         match stop_receive.recv_timeout(Duration::from_millis(10)) {
             Ok(v) => {
                 debug!("Received stop signal, signal: {}", v);
-                return;
+                break;
             }
             _ => {}
         };
@@ -56,6 +56,8 @@ pub fn jit_loop(
             }
         }
     }
+
+    debug!("JIT loop ended");
 }
 
 fn get_tx_packet(

diff --git a/chirpstack-concentratord-sx1301/src/handler/stats.rs b/chirpstack-concentratord-sx1301/src/handler/stats.rs
@@ -21,7 +21,7 @@ pub fn stats_loop(
         match stop_receive.recv_timeout(*stats_interval) {
             Ok(v) => {
                 debug!("Received stop signal, signal: {}", v);
-                return;
+                break;
             }
             _ => {}
         };
@@ -47,4 +47,6 @@ pub fn stats_loop(
 
         stats::send_and_reset(gateway_id, loc, metadata).expect("sending stats failed");
     }
+
+    debug!("Stats loop ended");
 }
diff --git a/chirpstack-concentratord-sx1301/src/handler/timersync.rs b/chirpstack-concentratord-sx1301/src/handler/timersync.rs
@@ -27,11 +27,13 @@ pub fn timesync_loop(stop_receive: Receiver<Signal>) {
         match stop_receive.recv_timeout(Duration::from_secs(60)) {
             Ok(v) => {
                 debug!("Received stop signal, signal: {}", v);
-                return;
+                break;
             }
             _ => {}
         };
     }
+
+    debug!("Timesync loop ended");
 }
 
 pub fn get_concentrator_count() -> u32 {

diff --git a/chirpstack-concentratord-sx1301/src/handler/uplink.rs b/chirpstack-concentratord-sx1301/src/handler/uplink.rs
@@ -16,7 +16,7 @@ pub fn handle_loop(gateway_id: &[u8], stop_receive: Receiver<Signal>) {
         match stop_receive.recv_timeout(Duration::from_millis(0)) {
             Ok(v) => {
                 debug!("Received stop signal, signal: {}", v);
-                return;
+                break;
             }
             _ => {}
         };
@@ -58,4 +58,6 @@ pub fn handle_loop(gateway_id: &[u8], stop_receive: Receiver<Signal>) {
 
         thread::sleep(Duration::from_millis(10));
     }
+
+    debug!("Uplink loop ended");
 }
diff --git a/chirpstack-concentratord-sx1302/Cargo.toml b/chirpstack-concentratord-sx1302/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "chirpstack-concentratord-sx1302"
-version = "3.0.0"
+version = "3.0.1"
 authors = ["Orne Brocaar <[email protected]>"]
 edition = "2018"
 publish = false

diff --git a/chirpstack-concentratord-sx1302/src/handler/command.rs b/chirpstack-concentratord-sx1302/src/handler/command.rs
@@ -28,7 +28,7 @@ pub fn handle_loop(
         match stop_receive.recv_timeout(Duration::from_millis(0)) {
             Ok(v) => {
                 debug!("Received stop signal, signal: {}", v);
-                return;
+                break;
             }
             _ => {}
         };
@@ -62,6 +62,8 @@ pub fn handle_loop(
 
         rep_sock.send(resp, 0).unwrap();
     }
+
+    debug!("Command loop ended");
 }
 
 fn handle_downlink(

diff --git a/chirpstack-concentratord-sx1302/src/handler/gps.rs b/chirpstack-concentratord-sx1302/src/handler/gps.rs
@@ -45,7 +45,7 @@ pub fn gps_loop(gps_tty_path: &str, stop_receive: Receiver<Signal>) {
         match stop_receive.recv_timeout(Duration::from_millis(0)) {
             Ok(v) => {
                 debug!("Received stop signal, signal: {}", v);
-                return;
+                break;
             }
             _ => {}
         };
@@ -112,6 +112,8 @@ pub fn gps_loop(gps_tty_path: &str, stop_receive: Receiver<Signal>) {
             }
         }
     }
+
+    debug!("GPS loop ended");
 }
 
 pub fn gps_validate_loop(stop_receive: Receiver<Signal>) {
@@ -126,7 +128,7 @@ pub fn gps_validate_loop(stop_receive: Receiver<Signal>) {
         match stop_receive.recv_timeout(Duration::from_secs(1)) {
             Ok(v) => {
                 debug!("Received stop signal, signal: {}", v);
-                return;
+                break;
             }
             _ => {}
         };
@@ -196,6 +198,8 @@ pub fn gps_validate_loop(stop_receive: Receiver<Signal>) {
             }
         }
     }
+
+    debug!("GPS validation loop ended");
 }
 
 pub fn cnt2time(count_us: u32) -> Result<SystemTime, String> {

diff --git a/chirpstack-concentratord-sx1302/src/handler/jit.rs b/chirpstack-concentratord-sx1302/src/handler/jit.rs
@@ -22,7 +22,7 @@ pub fn jit_loop(
         match stop_receive.recv_timeout(Duration::from_millis(10)) {
             Ok(v) => {
                 debug!("Received stop signal, signal: {}", v);
-                return;
+                break;
             }
             _ => {}
         };
@@ -55,6 +55,8 @@ pub fn jit_loop(
             }
         }
     }
+
+    debug!("JIT loop ended");
 }
 
 fn get_tx_packet(

diff --git a/chirpstack-concentratord-sx1302/src/handler/stats.rs b/chirpstack-concentratord-sx1302/src/handler/stats.rs
@@ -22,7 +22,7 @@ pub fn stats_loop(
         match stop_receive.recv_timeout(*stats_interval) {
             Ok(v) => {
                 debug!("Received stop signal, signal: {}", v);
-                return;
+                break;
             }
             _ => {}
         };
@@ -59,4 +59,6 @@ pub fn stats_loop(
 
         stats::send_and_reset(gateway_id, loc, &metadata).expect("sending stats failed");
     }
+
+    debug!("Stats loop ended");
 }
diff --git a/chirpstack-concentratord-sx1302/src/handler/uplink.rs b/chirpstack-concentratord-sx1302/src/handler/uplink.rs
@@ -16,7 +16,7 @@ pub fn handle_loop(gateway_id: &[u8], stop_receive: Receiver<Signal>) {
         match stop_receive.recv_timeout(Duration::from_millis(0)) {
             Ok(v) => {
                 debug!("Received stop signal, signal: {}", v);
-                return;
+                break;
             }
             _ => {}
         };
@@ -58,4 +58,6 @@ pub fn handle_loop(gateway_id: &[u8], stop_receive: Receiver<Signal>) {
 
         thread::sleep(Duration::from_millis(10));
     }
+
+    debug!("Uplink loop ended");
 }
diff --git a/gateway-id/Cargo.toml b/gateway-id/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "gateway-id"
-version = "3.0.0"
+version = "3.0.1"
 authors = ["Orne Brocaar <[email protected]>"]
 edition = "2018"
 publish = false