MMDVM/DMRGateway
1
0
Fork 0
mirror of https://github.com/g4klx/DMRGateway synced 2025-12-29 10:25:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ad simple JSON logging.

Browse Source
This commit is contained in:
Jonathan Naylor
2023-07-11 16:54:30 +01:00
parent 61ccb47afd
commit 852caca96e
6 changed files with 68 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
DMRGateway.cpp
View File

@@ -31,6 +31,7 @@
#include "Version.h"
#include "Thread.h"
#include "DMRLC.h"
#include "Utils.h"
#include "Sync.h"
#include "Log.h"
#include "GitVersion.h"
@@ -106,6 +107,7 @@ int main(int argc, char** argv)
int ret = 0;
do {
m_killed = false;
m_signal = 0;
gateway = new CDMRGateway(std::string(iniFile));
@@ -379,8 +381,10 @@ int CDMRGateway::run()
LogInfo(HEADER3);
LogInfo(HEADER4);
LogMessage("DMRGateway-%s is starting", VERSION);
LogMessage("Built %s %s (GitID #%.7s)", __TIME__, __DATE__, gitversion);
LogInfo("DMRGateway-%s is starting", VERSION);
LogInfo("Built %s %s (GitID #%.7s)", __TIME__, __DATE__, gitversion);
writeJSONStatus("DMRGateway is starting");
ret = createMMDVM();
if (!ret)
@@ -524,7 +528,8 @@ int CDMRGateway::run()
CStopWatch stopWatch;
stopWatch.start();
LogMessage("DMRGateway-%s is running", VERSION);
LogInfo("DMRGateway-%s is starting", VERSION);
LogInfo("Built %s %s (GitID #%.7s)", __TIME__, __DATE__, gitversion);
while (!m_killed) {
if (m_networkXlxEnabled && (m_xlxNetwork != NULL)) {
@@ -1261,6 +1266,9 @@ int CDMRGateway::run()
CThread::sleep(10U);
}
LogInfo("DMRGateway is stopping");
writeJSONStatus("DMRGateway is stopping");
delete m_xlxVoice;
m_repeater->close();
@@ -2640,6 +2648,16 @@ void CDMRGateway::buildNetworkHostNetworkString(std::string &str, const std::str
}
}
void CDMRGateway::writeJSONStatus(const std::string& status)
{
nlohmann::json json;
json["timestamp"] = CUtils::createTimestamp();
json["message"] = status;
WriteJSON("status", json);
}
void CDMRGateway::onDynamic(const unsigned char* message, unsigned int length)
{
assert(gateway != NULL);