Gateway id override

packaging/vendor/dragino/mips_24kc/files/chirpstack-mqtt-forwarder.toml

@@ -19,3 +19,10 @@
   ca_cert=""
   tls_cert=""
   tls_key=""
+
+[gateway]
+  # Gateway ID.
+  #
+  # Only set this if you would like to override the Gateway ID fetched from the backend.
+  # This will allow the MQTT loop to start prior backend setup.
+  #gateway_id=""

packaging/vendor/kerlink/klkgw/files/chirpstack-mqtt-forwarder.toml

@@ -29,3 +29,10 @@
   ca_cert=""
   tls_cert=""
   tls_key=""
+
+[gateway]
+  # Gateway ID.
+  #
+  # Only set this if you would like to override the Gateway ID fetched from the backend.
+  # This will allow the MQTT loop to start prior backend setup.
+  #gateway_id=""

packaging/vendor/multitech/conduit/files/ap1/chirpstack-mqtt-forwarder.toml

@@ -29,3 +29,10 @@
   ca_cert=""
   tls_cert=""
   tls_key=""
+
+[gateway]
+  # Gateway ID.
+  #
+  # Only set this if you would like to override the Gateway ID fetched from the backend.
+  # This will allow the MQTT loop to start prior backend setup.
+  #gateway_id=""

packaging/vendor/multitech/conduit/files/ap2/chirpstack-mqtt-forwarder.toml

@@ -29,3 +29,10 @@
   ca_cert=""
   tls_cert=""
   tls_key=""
+
+[gateway]
+  # Gateway ID.
+  #
+  # Only set this if you would like to override the Gateway ID fetched from the backend.
+  # This will allow the MQTT loop to start prior backend setup.
+  #gateway_id=""

packaging/vendor/multitech/conduit_ap/files/chirpstack-mqtt-forwarder.toml

@@ -29,3 +29,10 @@
   ca_cert=""
   tls_cert=""
   tls_key=""
+
+[gateway]
+  # Gateway ID.
+  #
+  # Only set this if you would like to override the Gateway ID fetched from the backend.
+  # This will allow the MQTT loop to start prior backend setup.
+  #gateway_id=""

packaging/vendor/multitech/conduit_ap3/files/chirpstack-mqtt-forwarder.toml

@@ -29,3 +29,10 @@
   ca_cert=""
   tls_cert=""
   tls_key=""
+
+[gateway]
+  # Gateway ID.
+  #
+  # Only set this if you would like to override the Gateway ID fetched from the backend.
+  # This will allow the MQTT loop to start prior backend setup.
+  #gateway_id=""

packaging/vendor/rak/mipsel_24kc/files/chirpstack-mqtt-forwarder.toml

@@ -19,3 +19,10 @@
   ca_cert=""
   tls_cert=""
   tls_key=""
+
+[gateway]
+  # Gateway ID.
+  #
+  # Only set this if you would like to override the Gateway ID fetched from the backend.
+  # This will allow the MQTT loop to start prior backend setup.
+  #gateway_id=""

packaging/vendor/tektelic/kona/files/chirpstack-mqtt-forwarder.toml

@@ -19,3 +19,10 @@
   ca_cert=""
   tls_cert=""
   tls_key=""
+
+[gateway]
+  # Gateway ID.
+  #
+  # Only set this if you would like to override the Gateway ID fetched from the backend.
+  # This will allow the MQTT loop to start prior backend setup.
+  #gateway_id=""

src/cmd/configfile.rs

@@ -238,6 +238,16 @@ pub fn run(config: &Configuration) {
 
   # On MQTT connection error.
   on_mqtt_connection_error=[]
+
+
+# Gateway configuration
+[gateway]
+
+  # Gateway ID.
+  #
+  # Only set this if you would like to override the Gateway ID fetched from the backend.
+  # This will allow the MQTT loop to start prior backend setup.
+  #gateway_id="{{ gateway.gateway_id }}"
 "#;
 
     let reg = Handlebars::new();

src/config.rs

@@ -14,6 +14,7 @@ pub struct Configuration {
     pub metadata: Metadata,
     pub commands: HashMap<String, Vec<String>>,
     pub callbacks: Callbacks,
+    pub gateway: Gateway,
 }
 
 impl Configuration {
@@ -176,3 +177,17 @@ pub struct Callbacks {
     pub on_mqtt_connected: Vec<String>,
     pub on_mqtt_connection_error: Vec<String>,
 }
+
+#[derive(Serialize, Deserialize)]
+#[serde(default)]
+pub struct Gateway {
+    pub gateway_id: Option<String>,
+}
+
+impl Default for Gateway {
+    fn default() -> Self {
+        Gateway {
+            gateway_id: None,
+        }
+    }
+}

src/main.rs

@@ -56,8 +56,24 @@ async fn main() {
 
     commands::setup(&config).expect("Setup commands error");
     metadata::setup(&config).expect("Setup metadata error");
-    backend::setup(&config).await.expect("Setup backend error");
-    mqtt::setup(&config).await.expect("Setup MQTT client error");
+
+    // Check for overriden gateway_id in config, in which case it will be used
+    // rather than waiting to fetch it from backend
+    if let Some(gateway_id) = &config.gateway.gateway_id {
+        if gateway_id.chars().count() == 0 {
+            panic!("overriden config gateway_id must not be an empty string");
+        }
+
+        info!("Gateway ID overriden in config, starting MQTT loop before polling for backend.");
+
+        mqtt::setup(&config).await.expect("Setup MQTT client error");
+        backend::setup(&config).await.expect("Setup backend error");
+    }
+    else {
+        // poll for backend first to retrieve gateway_id
+        backend::setup(&config).await.expect("Setup backend error");
+        mqtt::setup(&config).await.expect("Setup MQTT client error");
+    }
 
     let mut signals = Signals::new([SIGINT, SIGTERM]).unwrap();
     signals.forever().next();

src/mqtt.rs

@@ -45,7 +45,19 @@ pub async fn setup(conf: &Configuration) -> Result<()> {
     };
 
     // get gateway id
-    let gateway_id = get_gateway_id().await?;
+    let gateway_id = if let Some(gateway_id) = &conf.gateway.gateway_id {
+        // use gateway id overriden in config
+        gateway_id.clone()
+    }
+    else {
+        // fetch from backend
+        get_gateway_id().await?
+    };
+
+    info!(
+        "Gateway ID retrieved, gateway_id: {}",
+        gateway_id
+    );
 
     // set client id
     let client_id = if conf.mqtt.client_id.is_empty() {