g4klx/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost.git synced 2026-04-06 23:13:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Clean up the MQTT interface.

Browse source
This commit is contained in:
Jonathan Naylor 2022-11-29 17:18:34 +00:00
parent 96364136d9
commit 53b73c6558
5 changed files with 25 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Log.cpp
View file

@ -34,7 +34,6 @@
#include <cstring>
CMQTTPublisher* m_mqtt = NULL;
static std::string m_mqttName;
static unsigned int m_fileLevel = 2U;
static std::string m_filePath;
@ -128,7 +127,7 @@ bool LogOpen()
return logOpenNoRotate();
}
bool LogInitialise(bool daemon, const std::string& filePath, const std::string& fileRoot, unsigned int fileLevel, unsigned int displayLevel, bool rotate, const std::string& mqttName)
bool LogInitialise(bool daemon, const std::string& filePath, const std::string& fileRoot, unsigned int fileLevel, unsigned int displayLevel, bool rotate)
{
m_filePath = filePath;
m_fileRoot = fileRoot;
@ -136,7 +135,6 @@ bool LogInitialise(bool daemon, const std::string& filePath, const std::string&
m_displayLevel = displayLevel;
m_daemon = daemon;
m_fileRotate = rotate;
m_mqttName = mqttName;
if (m_daemon)
m_displayLevel = 0U;
@ -176,12 +174,8 @@ void Log(unsigned int level, const char* fmt, ...)
va_end(vl);
if (m_mqtt != NULL) {
char topic[100U];
::sprintf(topic, "%s/log/%c", m_mqttName.c_str(), LEVELS[level]);
m_mqtt->publish(topic, buffer + 3U);
}
if (m_mqtt != NULL)
m_mqtt->publish("log", buffer);
if (level >= m_fileLevel && m_fileLevel != 0U) {
bool ret = ::LogOpen();