Use Configured MQTT Topic

2020-06-22 09:44:05 +02:00
parent 4f5998cf5f
commit 48f930c19e
4 changed files with 37 additions and 15 deletions
@@ -9,7 +9,7 @@ namespace Toon {

 Bridge::Bridge(int port, const ToonSettings& toonSettings, const MQTTSettings& mqttSettings) :
 	m_mqttClient(mqttSettings.hostname, mqttSettings.port),
-	m_messageHandler(m_mqttClient),
+	m_messageHandler(m_mqttClient, mqttSettings.topic),
 	m_port(port),
 	m_toonSettings(toonSettings),
 	m_mqttSettings(mqttSettings)
@@ -19,9 +19,12 @@ Bridge::Bridge(int port, const ToonSettings& toonSettings, const MQTTSettings& m

 Bridge::~Bridge()
 {
+	std::stringstream ss;
+	ss << m_mqttSettings.topic << "/BridgeState";
+
 	MQTT::MQTTMessage message;
-	message.topic = m_mqttSettings.topic;
-	message.payload = "ToonBridge Stop";
+	message.topic = ss.str();
+	message.payload = "Stop";
 	m_mqttClient.Send(message);
 }

@@ -39,9 +42,12 @@ void Bridge::Start()
 	m_pWebSocketSubscription.reset(new WebSocketSubscription(m_toonSettings));
 	m_messageHandler.Connect(std::bind(&Bridge::TimeToLiveCallback, this, m_pWebSocketSubscription.get(), std::placeholders::_1));

+	std::stringstream ss;
+	ss << m_mqttSettings.topic << "/BridgeState";
+
 	MQTT::MQTTMessage message;
-	message.topic = m_mqttSettings.topic;
-	message.payload = "ToonBridge Start";
+	message.topic = ss.str();
+	message.payload = ss.str();
 	m_mqttClient.Send(message);
 }