MMDVM/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost synced 2025-12-23 16:55:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Publish the log data via MQTT topics $NAME/log/$LEVEL.

Browse Source
This commit is contained in:
Jonathan Naylor
2022-11-27 20:27:44 +00:00
parent 3202d73ce5
commit 96364136d9
14 changed files with 288 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Log.cpp
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2015,2016,2020 by Jonathan Naylor G4KLX
* Copyright (C) 2015,2016,2020,2022 by Jonathan Naylor G4KLX
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -17,6 +17,7 @@
*/
#include "Log.h"
#include "MQTTPublisher.h"
#if defined(_WIN32) || defined(_WIN64)
#include <Windows.h>
@@ -32,6 +33,9 @@
#include <cassert>
#include <cstring>
CMQTTPublisher* m_mqtt = NULL;
static std::string m_mqttName;
static unsigned int m_fileLevel = 2U;
static std::string m_filePath;
static std::string m_fileRoot;
@@ -124,7 +128,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)
bool LogInitialise(bool daemon, const std::string& filePath, const std::string& fileRoot, unsigned int fileLevel, unsigned int displayLevel, bool rotate, const std::string& mqttName)
{
m_filePath = filePath;
m_fileRoot = fileRoot;
@@ -132,6 +136,7 @@ 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;
@@ -171,6 +176,13 @@ 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 (level >= m_fileLevel && m_fileLevel != 0U) {
bool ret = ::LogOpen();
if (!ret)