From 1e4d768d254404c6e8ef82c8ce0e9b602d9bc99e Mon Sep 17 00:00:00 2001
From: Dreaded_X <tim@huizinga.dev>
Date: Tue, 17 Jan 2023 18:23:57 +0100
Subject: [PATCH] mqtt client name is now a config option

---
 config/ares.dev.toml | 1 +
 config/config.toml   | 1 +
 config/zeus.dev.toml | 1 +
 src/config.rs        | 3 ++-
 src/main.rs          | 2 +-
 5 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/config/ares.dev.toml b/config/ares.dev.toml
index c9342c2..5e03e00 100644
--- a/config/ares.dev.toml
+++ b/config/ares.dev.toml
@@ -4,6 +4,7 @@ base_url = "https://login.huizinga.dev/api/oidc"
 [mqtt]
 host="olympus.vpn.huizinga.dev"
 port=8883
+client_name="automation-ares"
 username="mqtt"
 password="${MQTT_PASSWORD}"
 tls=true
diff --git a/config/config.toml b/config/config.toml
index ec32bbf..e3d0365 100644
--- a/config/config.toml
+++ b/config/config.toml
@@ -4,6 +4,7 @@ base_url = "https://login.huizinga.dev/api/oidc"
 [mqtt]
 host="mosquitto"
 port=8883
+client_name="automation_rs"
 username="mqtt"
 password="${MQTT_PASSWORD}"
 
diff --git a/config/zeus.dev.toml b/config/zeus.dev.toml
index d594a1a..ca90e70 100644
--- a/config/zeus.dev.toml
+++ b/config/zeus.dev.toml
@@ -4,6 +4,7 @@ base_url = "https://login.huizinga.dev/api/oidc"
 [mqtt]
 host="olympus.lan.huizinga.dev"
 port=8883
+client_name="automation-zeus"
 username="mqtt"
 password="${MQTT_PASSWORD}"
 tls=true
diff --git a/src/config.rs b/src/config.rs
index 55af269..83a251e 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -32,10 +32,11 @@ pub struct OpenIDConfig {
 pub struct MqttConfig {
     pub host: String,
     pub port: u16,
+    pub client_name: String,
     pub username: String,
     pub password: String,
     #[serde(default)]
-    pub tls: bool
+    pub tls: bool,
 }
 
 #[derive(Debug, Deserialize)]
diff --git a/src/main.rs b/src/main.rs
index 9fe8db1..3f0c0f1 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -61,7 +61,7 @@ async fn app() -> Result<(), Box<dyn std::error::Error>> {
 
     // Configure MQTT
     let mqtt = config.mqtt.clone();
-    let mut mqttoptions = MqttOptions::new("rust-test", mqtt.host, mqtt.port);
+    let mut mqttoptions = MqttOptions::new(mqtt.client_name, mqtt.host, mqtt.port);
     mqttoptions.set_credentials(mqtt.username, mqtt.password);
     mqttoptions.set_keep_alive(Duration::from_secs(5));