All specific logging shortcuts are now bundled in logging.h

common/include/RESTHttpsServer.h

@@ -68,9 +68,6 @@
 
 #define endpointArgs http::response<http::string_body>& res, queries_t& queries
 
-#define ServerLOG(sev)  LOG(sev) << "HttpsServer: "
-#define RESTAPILOG(sev) LOG(sev) << "REST-API: "
-
 /******************************************************************************/
 
 /**

common/include/logging.h

@@ -32,7 +32,10 @@
 //to use it, only a boost severity-logger named lg is required
 #define LOG(sev) BOOST_LOG_SEV(lg, boost::log::trivial::sev)
 
-#define LOGH(sev) LOG(sev) << "HttpsServer: "
+//set of log macros for specific application parts
+#define ServerLOG(sev)  LOG(sev) << "HttpsServer: "
+#define RESTAPILOG(sev) LOG(sev) << "REST-API: "
+#define LOGM(sev)       LOG(sev) << "Mosquitto: "
 
 //another shortcut which can take the severity level as variable
 #define LOG_VAR(var) BOOST_LOG_SEV(lg, var)

dcdbpusher/MQTTPusher.cpp

@@ -11,8 +11,6 @@
 #include <unistd.h>
 #include "timestamp.h"
 
-#define LOGM(sev) LOG(sev) << "Mosquitto: "
-
 MQTTPusher::MQTTPusher(int brokerPort, const std::string& brokerHost, const std::string& sensorPattern, int qosLevel,
 					   pluginVector_t& plugins, an_pluginVector_t& aPlugins, int maxNumberOfMessages, unsigned int maxInflightMsgNum, unsigned int maxQueuedMsgNum) :
 		_qosLevel(qosLevel),