Move heartbeat_interval config option.

Author: brocaar

src/config.rs

@@ -17,6 +17,7 @@ pub struct Configuration {
     pub mesh: Mesh,
     pub backend: Backend,
     pub mappings: Mappings,
+    pub events: Events,
 }
 
 impl Configuration {
@@ -56,8 +57,6 @@ impl Default for Logging {
 #[serde(default)]
 pub struct Mesh {
     pub signing_key: Aes128Key,
-    #[serde(with = "humantime_serde")]
-    pub heartbeat_interval: Duration,
     pub frequencies: Vec<u32>,
     pub data_rate: DataRate,
     pub tx_power: i32,
@@ -72,7 +71,6 @@ impl Default for Mesh {
     fn default() -> Self {
         Mesh {
             signing_key: Aes128Key::null(),
-            heartbeat_interval: Duration::from_secs(300),
             frequencies: vec![868100000, 868300000, 868500000],
             data_rate: DataRate {
                 modulation: Modulation::LORA,
@@ -155,6 +153,21 @@ pub struct DataRate {
     pub bitrate: u32,
 }
 
+#[derive(Serialize, Deserialize, PartialEq, Eq)]
+#[serde(default)]
+pub struct Events {
+    #[serde(with = "humantime_serde")]
+    pub heartbeat_interval: Duration,
+}
+
+impl Default for Events {
+    fn default() -> Self {
+        Events {
+            heartbeat_interval: Duration::from_secs(300),
+        }
+    }
+}
+
 #[derive(Serialize, Deserialize, Clone, Copy, PartialEq, Eq, Default)]
 #[allow(non_camel_case_types)]
 #[allow(clippy::upper_case_acronyms)]

src/heartbeat.rs

@@ -15,17 +15,17 @@ use crate::packets;
 pub async fn setup(conf: &Configuration) -> Result<()> {
     // Only Relay gatewways need to report heartbeat as the Border Gateway is already internet
     // connected and reports status through the Concentratord.
-    if conf.mesh.border_gateway || conf.mesh.heartbeat_interval.is_zero() {
+    if conf.mesh.border_gateway || conf.events.heartbeat_interval.is_zero() {
         return Ok(());
     }
 
     info!(
         "Starting heartbeat loop, heartbeat_interval: {:?}",
-        conf.mesh.heartbeat_interval
+        conf.events.heartbeat_interval
     );
 
     tokio::spawn({
-        let heartbeat_interval = conf.mesh.heartbeat_interval;
+        let heartbeat_interval = conf.events.heartbeat_interval;
 
         async move {
             loop {