Merge branch 'master' into SimpleDMR

DMRGateway.cpp

@@ -336,7 +336,11 @@ int CDMRGateway::run()
 	}
 #endif
 
-	ret = ::LogInitialise(m_conf.getLogFilePath(), m_conf.getLogFileRoot(), m_conf.getLogFileLevel(), m_conf.getLogDisplayLevel());
+#if !defined(_WIN32) && !defined(_WIN64)
+        ret = ::LogInitialise(m_daemon, m_conf.getLogFilePath(), m_conf.getLogFileRoot(), m_conf.getLogFileLevel(), m_conf.getLogDisplayLevel());
+#else
+        ret = ::LogInitialise(false, m_conf.getLogFilePath(), m_conf.getLogFileRoot(), m_conf.getLogFileLevel(), m_conf.getLogDisplayLevel());
+#endif
 	if (!ret) {
 		::fprintf(stderr, "DMRGateway: unable to open the log file\n");
 		return 1;

Log.cpp

@@ -1,5 +1,5 @@
 /*
- *   Copyright (C) 2015,2016 by Jonathan Naylor G4KLX
+ *   Copyright (C) 2015,2016,2020 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
@@ -22,6 +22,7 @@
 #include <Windows.h>
 #else
 #include <sys/time.h>
+#include <unistd.h>
 #endif
 
 #include <cstdio>
@@ -36,6 +37,7 @@ static std::string m_filePath;
 static std::string m_fileRoot;
 
 static FILE* m_fpLog = NULL;
+static bool m_daemon = false;
 
 static unsigned int m_displayLevel = 2U;
 
@@ -45,6 +47,8 @@ static char LEVELS[] = " DMIWEF";
 
 static bool LogOpen()
 {
+	bool status = false;
+	
 	if (m_fileLevel == 0U)
 		return true;
 
@@ -68,18 +72,29 @@ static bool LogOpen()
 	::sprintf(filename, "%s/%s-%04d-%02d-%02d.log", m_filePath.c_str(), m_fileRoot.c_str(), tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday);
 #endif
 
-	m_fpLog = ::fopen(filename, "a+t");
-	m_tm = *tm;
+	if ((m_fpLog = ::fopen(filename, "a+t")) != NULL)
+	{
+		status = true;
 
-    return m_fpLog != NULL;
+#if !defined(_WIN32) && !defined(_WIN64)
+		if (m_daemon)
+			dup2(fileno(m_fpLog), fileno(stderr));
+#endif
 	}
 	
-bool LogInitialise(const std::string& filePath, const std::string& fileRoot, unsigned int fileLevel, unsigned int displayLevel)
+	m_tm = *tm;
+
+	return status;
+}
+
+bool LogInitialise(bool daemon, const std::string& filePath, const std::string& fileRoot, unsigned int fileLevel, unsigned int displayLevel)
 {
 	m_filePath     = filePath;
 	m_fileRoot     = fileRoot;
 	m_fileLevel    = fileLevel;
 	m_displayLevel = displayLevel;
+	m_daemon       = daemon;
+
 	return ::LogOpen();
 }
 
@@ -93,7 +108,7 @@ void Log(unsigned int level, const char* fmt, ...)
 {
 	assert(fmt != NULL);
 
-	char buffer[501U];
+	char buffer[300U];
 #if defined(_WIN32) || defined(_WIN64)
 	SYSTEMTIME st;
 	::GetSystemTime(&st);
@@ -105,13 +120,13 @@ void Log(unsigned int level, const char* fmt, ...)
 
 	struct tm* tm = ::gmtime(&now.tv_sec);
 
-	::sprintf(buffer, "%c: %04d-%02d-%02d %02d:%02d:%02d.%03lu ", LEVELS[level], tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday, tm->tm_hour, tm->tm_min, tm->tm_sec, now.tv_usec / 1000U);
+	::sprintf(buffer, "%c: %04d-%02d-%02d %02d:%02d:%02d.%03ld ", LEVELS[level], tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday, tm->tm_hour, tm->tm_min, tm->tm_sec, now.tv_usec / 1000L);
 #endif
 
 	va_list vl;
 	va_start(vl, fmt);
 
-	::vsnprintf(buffer + ::strlen(buffer), 500, fmt, vl);
+	::vsprintf(buffer + ::strlen(buffer), fmt, vl);
 
 	va_end(vl);
 
@@ -134,3 +149,4 @@ void Log(unsigned int level, const char* fmt, ...)
 		exit(1);
 	}
 }
+

Log.h

@@ -30,7 +30,7 @@
 
 extern void Log(unsigned int level, const char* fmt, ...);
 
-extern bool LogInitialise(const std::string& filePath, const std::string& fileRoot, unsigned int fileLevel, unsigned int displayLevel);
+extern bool LogInitialise(bool daemon, const std::string& filePath, const std::string& fileRoot, unsigned int fileLevel, unsigned int displayLevel);
 extern void LogFinalise();
 
 #endif

Thread.cpp

@@ -1,5 +1,5 @@
 /*
- *   Copyright (C) 2015,2016 by Jonathan Naylor G4KLX
+ *   Copyright (C) 2015,2016,2020 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
@@ -95,7 +95,13 @@ void* CThread::helper(void* arg)
 
 void CThread::sleep(unsigned int ms)
 {
-	::usleep(ms * 1000);
+	struct timespec ts;
+
+	ts.tv_sec  = ms / 1000U;
+	ts.tv_nsec = (ms % 1000U) * 1000000U;
+
+	::nanosleep(&ts, NULL);
 }
 
 #endif
+