Add more log configuration #4

DStarGatewayApp.cpp

@@ -86,6 +86,7 @@ void CDStarGatewayApp::run()
 	m_thread->Run();
 	m_thread->Wait();
 	CLog::logInfo("exiting\n");
+	CLog::finalise();
 }
 
 bool CDStarGatewayApp::createThread()
@@ -100,10 +101,12 @@ bool CDStarGatewayApp::createThread()
 		return false;
 	}
 
+	// Setup Log
 	TLog log;
 	config.getLog(log);
-	CLog::addTarget(new CLogConsoleTarget(LS_INFO));
+	CLog::finalise();
-	CLog::addTarget(new CLogFileTarget(LS_INFO, log.logDir, true));
+	if(log.m_displayLevel	!= LOG_NONE) CLog::addTarget(new CLogConsoleTarget(log.m_displayLevel));
+	if(log.m_fileLevel		!= LOG_NONE) CLog::addTarget(new CLogFileTarget(log.m_fileLevel, log.logDir, log.m_fileRotate));
 
 	Tpaths paths;
 	config.getPaths(paths);

DStarGatewayConfig.cpp

@@ -126,13 +126,38 @@ bool CDStarGatewayConfig::loadAPRS(const CConfig & cfg)
 
 bool CDStarGatewayConfig::loadLog(const CConfig & cfg)
 {
-	bool ret =cfg.getValue("log", "path", m_log.logDir, 0, 2048, "/var/log/dstargateway/");
+	bool ret = cfg.getValue("log", "path", m_log.logDir, 0, 2048, "/var/log/dstargateway/");
-
 	if(ret && m_log.logDir[m_log.logDir.length() - 1] != '/') {
 		m_log.logDir.push_back('/');
 	}
 
-	//TODO 20211226 check if directory are accessible
+	ret = cfg.getValue("log", "fileRoot", m_log.m_fileRoot, 0, 64, "dstargateway") && ret;
+	ret = cfg.getValue("log", "fileRotate", m_log.m_fileRotate, true) && ret;
+
+	std::string levelStr;
+	ret = cfg.getValue("log", "fileLevel", levelStr, "info", {"trace", "debug", "info", "warning", "error", "fatal", "none"}) && ret;
+	if(ret) {
+		if(levelStr == "trace")			m_log.m_fileLevel = LOG_TRACE;
+		else if(levelStr == "debug")	m_log.m_fileLevel = LOG_DEBUG;
+		else if(levelStr == "info")		m_log.m_fileLevel = LOG_INFO;
+		else if(levelStr == "warning")	m_log.m_fileLevel = LOG_WARNING;
+		else if(levelStr == "error")	m_log.m_fileLevel = LOG_ERROR;
+		else if(levelStr == "fatal")	m_log.m_fileLevel = LOG_FATAL;
+		else if(levelStr == "none")		m_log.m_fileLevel = LOG_NONE;
+	}
+
+	ret = cfg.getValue("log", "displayLevel", levelStr, "info", {"trace", "debug", "info", "warning", "error", "fatal", "none"}) && ret;
+	if(ret) {
+		if(levelStr == "trace")			m_log.m_displayLevel = LOG_TRACE;
+		else if(levelStr == "debug")	m_log.m_displayLevel = LOG_DEBUG;
+		else if(levelStr == "info")		m_log.m_displayLevel = LOG_INFO;
+		else if(levelStr == "warning")	m_log.m_displayLevel = LOG_WARNING;
+		else if(levelStr == "error")	m_log.m_displayLevel = LOG_ERROR;
+		else if(levelStr == "fatal")	m_log.m_displayLevel = LOG_FATAL;
+		else if(levelStr == "none")		m_log.m_displayLevel = LOG_NONE;
+	}
+
+	//TODO 20211226 check if directories are accessible
 
 	return ret;
 }

DStarGatewayConfig.h

@@ -23,6 +23,7 @@
 
 #include "Defs.h"
 #include "Config.h"
+#include "LogSeverity.h"
 
 typedef struct {
 	GATEWAY_TYPE type;
@@ -79,6 +80,10 @@ typedef struct {
 
 typedef struct {
 	std::string logDir;
+	LOG_SEVERITY m_displayLevel;
+	LOG_SEVERITY m_fileLevel;
+	std::string m_fileRoot;
+	bool m_fileRotate;
 } TLog;
 
 typedef struct {

Log.cpp

@@ -24,10 +24,9 @@
 #include "Log.h"
 #include "LogConsoleTarget.h"
 
-LOG_SEVERITY CLog::m_level(LS_DEBUG);
 bool CLog::m_addedTargets(false);
 std::recursive_mutex CLog::m_targetsMutex;
-std::vector<CLogTarget *> CLog::m_targets = { new CLogConsoleTarget(LS_DEBUG) };
+std::vector<CLogTarget *> CLog::m_targets = { new CLogConsoleTarget(LOG_DEBUG) };
 
 void CLog::addTarget(CLogTarget* target)
 {

Log.h

@@ -24,6 +24,7 @@
 #include <boost/algorithm/string.hpp>
 #include <mutex>
 #include <sstream>
+#include <cassert>
 
 #include "StringUtils.h"
 #include "LogTarget.h"
@@ -31,7 +32,6 @@
 class CLog
 {
 private:
-    static LOG_SEVERITY m_level;
     static std::vector<CLogTarget *> m_targets;
     static bool m_addedTargets;
     static std::recursive_mutex m_targetsMutex;
@@ -40,39 +40,41 @@ private:
 
     template<typename... Args> static void formatLogMessage(std::string& output, LOG_SEVERITY severity, const std::string & f, Args... args)
     {
-            std::string severityStr;
+        assert(severity != LOG_NONE);
-            switch (severity)
+        
-            {
+        std::string severityStr;
-            case LS_DEBUG:
+        switch (severity)
-                severityStr = "DEBUG  ";
+        {
-                break;
+        case LOG_DEBUG:
-            case LS_ERROR:
+            severityStr = "DEBUG  ";
-                severityStr = "ERROR  ";
+            break;
-                break;
+        case LOG_ERROR:
-            case LS_FATAL:
+            severityStr = "ERROR  ";
-                severityStr = "FATAL  ";
+            break;
-                break;
+        case LOG_FATAL:
-            case LS_INFO :
+            severityStr = "FATAL  ";
-                severityStr = "INFO   ";
+            break;
-                break;
+        case LOG_INFO :
-            case LS_WARNING:
+            severityStr = "INFO   ";
-                severityStr = "WARNING";
+            break;
-                break;
+        case LOG_WARNING:
-            case LS_TRACE:
+            severityStr = "WARNING";
-                severityStr = "TRACE  ";
+            break;
-                break;
+        case LOG_TRACE:
-            default:
+            severityStr = "TRACE  ";
-                break;
+            break;
-            }
+        default:
+            break;
+        }
 
-            std::string message = CStringUtils::string_format(f, args...);
+        std::string message = CStringUtils::string_format(f, args...);
-            boost::trim(message);
+        boost::trim(message);
-            std::string timeUtc;
+        std::string timeUtc;
-            getTimeStamp(timeUtc);
+        getTimeStamp(timeUtc);
-            std::stringstream s;
+        std::stringstream s;
-            s << "[" <<  timeUtc << "] [" << severityStr << "] " << message << std::endl;
+        s << "[" <<  timeUtc << "] [" << severityStr << "] " << message << std::endl;
 
-            output = s.str();
+        output = s.str();
     }
 
 public:
@@ -82,27 +84,27 @@ public:
 
     template<typename... Args> static void logDebug(const std::string & f, Args... args)
     {
-        log(LS_DEBUG, f, args...);
+        log(LOG_DEBUG, f, args...);
     }
 
     template<typename... Args> static void logInfo(const std::string & f, Args... args)
     {
-        log(LS_INFO, f, args...);
+        log(LOG_INFO, f, args...);
     }
 
     template<typename... Args> static void logWarning(const std::string & f, Args... args)
     {
-        log(LS_WARNING, f, args...);
+        log(LOG_WARNING, f, args...);
     }
 
     template<typename... Args> static void logError(const std::string & f, Args... args)
     {
-        log(LS_ERROR, f, args...);
+        log(LOG_ERROR, f, args...);
     }
 
     template<typename... Args> static void logFatal(const std::string & f, Args... args)
     {
-        log(LS_FATAL, f, args...);
+        log(LOG_FATAL, f, args...);
     }
 
     template<typename... Args> static void log(LOG_SEVERITY severity, const std::string & f, Args... args)
@@ -111,8 +113,11 @@ public:
 
         std::string msg;
         for(auto target : m_targets) {
-            if(target->getLevel() >= CLog::m_level) {
+            if(severity >= target->getLevel()) {
-                if(msg.empty()) formatLogMessage(msg, severity, f, args...);
+
+                if(msg.empty())
+                    formatLogMessage(msg, severity, f, args...);
+
                 target->printLog(msg);
             }
         }

LogSeverity.h

@@ -0,0 +1,29 @@
+/*
+ *   Copyright (c) 2021-2022 by Geoffrey Merck F4FXL / KC3FRA
+ *
+ *   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
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#pragma once
+
+enum LOG_SEVERITY : unsigned int {
+    LOG_TRACE = 1,
+    LOG_DEBUG,
+    LOG_INFO,
+    LOG_WARNING,
+    LOG_ERROR,
+    LOG_FATAL,
+    LOG_NONE = 0xFFFFFFFF
+};

LogTarget.h

@@ -20,14 +20,7 @@
 
 #include <string>
 
-enum LOG_SEVERITY {
+#include "LogSeverity.h"
-    LS_TRACE = 1,
-    LS_DEBUG,
-    LS_INFO,
-    LS_WARNING,
-    LS_ERROR,
-    LS_FATAL
-};
 
 class CLogTarget
 {

example.cfg

@@ -142,6 +142,10 @@ password=12345
 
 [Log]
 path=/var/log/dstargateway/
+fileRoot=       # defaults to dstarGateway
+fileRotate=     # rotate log files daily, defaults to true
+fileLevel=      # defaults to info, valid values are trace, debug, info, warning, error, fatal, none
+displayLevel=   # defaults to info, valid values are trace, debug, info, warning, error, fatal, none
 
 [Paths]
 data=/usr/local/share/dstargateway.d/ #Path where the data (hostfiles, audio files etc) can be found