From f315c8bc879816fe17297a338be76af622a6225d Mon Sep 17 00:00:00 2001
From: john30 <ebusd@ebusd.eu>
Date: Sat, 13 May 2017 09:04:44 +0200
Subject: [PATCH] optimized

---
 src/ebusd/mqtthandler.cpp | 9 ++++++---
 src/ebusd/mqtthandler.h   | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/ebusd/mqtthandler.cpp b/src/ebusd/mqtthandler.cpp
index c772e303..6c35fc1d 100644
--- a/src/ebusd/mqtthandler.cpp
+++ b/src/ebusd/mqtthandler.cpp
@@ -292,7 +292,7 @@ MqttHandler::MqttHandler(UserInfo* userInfo, BusHandler* busHandler, MessageMap*
       }
     }
   }
-  m_globalTopic = getTopic(NULL)+"global/";
+  m_globalTopic = getTopic(NULL, -1, "global/");
   m_mosquitto = NULL;
   if (mosquitto_lib_init() != MOSQ_ERR_SUCCESS) {
     logOtherError("mqtt", "unable to initialize");
@@ -489,7 +489,7 @@ void MqttHandler::run() {
   publishTopic(m_globalTopic+"running", "true");
   publishTopic(signalTopic, "false");
   mosquitto_message_callback_set(m_mosquitto, on_message);
-  string subTopic = getTopic(NULL)+"#";
+  string subTopic = getTopic(NULL, -1, "#");
   mosquitto_subscribe(m_mosquitto, NULL, subTopic.c_str(), 0);
   while (isRunning()) {
     handleTraffic();
@@ -557,7 +557,7 @@ void MqttHandler::handleTraffic() {
   }
 }
 
-string MqttHandler::getTopic(const Message* message, ssize_t fieldIndex) {
+string MqttHandler::getTopic(const Message* message, ssize_t fieldIndex, const string& suffix) {
   ostringstream ret;
   for (size_t i = 0; i < m_topicStrs.size(); i++) {
     ret << m_topicStrs[i];
@@ -572,6 +572,9 @@ string MqttHandler::getTopic(const Message* message, ssize_t fieldIndex) {
       }
     }
   }
+  if (!suffix.empty()) {
+    ret << suffix;
+  }
   return ret.str();
 }
 
diff --git a/src/ebusd/mqtthandler.h b/src/ebusd/mqtthandler.h
index 98f176bf..87c56e19 100644
--- a/src/ebusd/mqtthandler.h
+++ b/src/ebusd/mqtthandler.h
@@ -100,7 +100,7 @@ class MqttHandler : public DataSink, public DataSource, public Thread {
    * @param fieldIndex the optional field index for the field column, or -1.
    * @return the topic string.
    */
-  string getTopic(const Message* message, ssize_t fieldIndex = -1);
+  string getTopic(const Message* message, ssize_t fieldIndex = -1, const string& suffix = "");
 
   /**
    * Prepare a @a Message and publish as topic.