ShaYmez/NXDNClients
1
0
Fork 0
mirror of https://github.com/ShaYmez/NXDNClients.git synced 2024-11-22 15:28:36 -05:00
Code Issues Projects Releases Wiki Activity

Add selectable logging levels to the gateway.

Browse Source
This commit is contained in:
Jonathan Naylor 2020-08-24 10:09:36 +01:00
parent a3b5c378e1
commit 458255f13e
5 changed files with 31 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
NXDNGateway/Conf.cpp
View File

@ -62,6 +62,8 @@ m_lookupTime(0U),
m_voiceEnabled(true), m_voiceEnabled(true),
m_voiceLanguage("en_GB"), m_voiceLanguage("en_GB"),
m_voiceDirectory(), m_voiceDirectory(),
m_logDisplayLevel(0U),
m_logFileLevel(0U),
m_logFilePath(), m_logFilePath(),
m_logFileRoot(), m_logFileRoot(),
m_aprsEnabled(false), m_aprsEnabled(false),
@ -194,6 +196,10 @@ bool CConf::read()
m_logFilePath = value; m_logFilePath = value;
else if (::strcmp(key, "FileRoot") == 0) else if (::strcmp(key, "FileRoot") == 0)
m_logFileRoot = value; m_logFileRoot = value;
else if (::strcmp(key, "FileLevel") == 0)
m_logFileLevel = (unsigned int)::atoi(value);
else if (::strcmp(key, "DisplayLevel") == 0)
m_logDisplayLevel = (unsigned int)::atoi(value);
} else if (section == SECTION_APRS) { } else if (section == SECTION_APRS) {
if (::strcmp(key, "Enable") == 0) if (::strcmp(key, "Enable") == 0)
m_aprsEnabled = ::atoi(value) == 1; m_aprsEnabled = ::atoi(value) == 1;
@ -353,11 +359,6 @@ std::string CConf::getVoiceDirectory() const
return m_voiceDirectory; return m_voiceDirectory;
} }
std::string CConf::getLogFilePath() const
{
return m_logFilePath;
}
bool CConf::getAPRSEnabled() const bool CConf::getAPRSEnabled() const
{ {
return m_aprsEnabled; return m_aprsEnabled;
@ -383,9 +384,24 @@ std::string CConf::getAPRSDescription() const
return m_aprsDescription; return m_aprsDescription;
} }
unsigned int CConf::getLogDisplayLevel() const
{
return m_logDisplayLevel;
}
unsigned int CConf::getLogFileLevel() const
{
return m_logFileLevel;
}
std::string CConf::getLogFilePath() const
{
return m_logFilePath;
}
std::string CConf::getLogFileRoot() const std::string CConf::getLogFileRoot() const
{ {
return m_logFileRoot; return m_logFileRoot;
} }
unsigned int CConf::getNetworkPort() const unsigned int CConf::getNetworkPort() const

4
NXDNGateway/Conf.h
View File

@ -67,6 +67,8 @@ public:
std::string getAPRSDescription() const; std::string getAPRSDescription() const;
// The Log section // The Log section
unsigned int getLogDisplayLevel() const;
unsigned int getLogFileLevel() const;
std::string getLogFilePath() const; std::string getLogFilePath() const;
std::string getLogFileRoot() const; std::string getLogFileRoot() const;
@ -119,6 +121,8 @@ private:
std::string m_voiceLanguage; std::string m_voiceLanguage;
std::string m_voiceDirectory; std::string m_voiceDirectory;
unsigned int m_logDisplayLevel;
unsigned int m_logFileLevel;
std::string m_logFilePath; std::string m_logFilePath;
std::string m_logFileRoot; std::string m_logFileRoot;

2
NXDNGateway/NXDNGateway.cpp
View File

@ -164,7 +164,7 @@ void CNXDNGateway::run()
} }
#endif #endif
ret = ::LogInitialise(m_conf.getLogFilePath(), m_conf.getLogFileRoot(), 1U, 1U); ret = ::LogInitialise(m_conf.getLogFilePath(), m_conf.getLogFileRoot(), m_conf.getLogFileLevel(), m_conf.getLogDisplayLevel());
if (!ret) { if (!ret) {
::fprintf(stderr, "NXDNGateway: unable to open the log file\n"); ::fprintf(stderr, "NXDNGateway: unable to open the log file\n");
return; return;

3
NXDNGateway/NXDNGateway.ini
View File

@ -46,6 +46,9 @@ Name=NXDN.csv
Time=24 Time=24
[Log] [Log]
# Logging levels, 0=No logging
DisplayLevel=1
FileLevel=1
FilePath=. FilePath=.
FileRoot=NXDNGateway FileRoot=NXDNGateway

2
NXDNGateway/Version.h
View File

@ -19,6 +19,6 @@
#if !defined(VERSION_H) #if !defined(VERSION_H)
#define VERSION_H #define VERSION_H
const char* VERSION = "20200701"; const char* VERSION = "20200824";
#endif #endif