MMDVM/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost synced 2026-02-05 14:15:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Modify the logging system greatly.

Browse Source
This commit is contained in:
Jonathan Naylor
2016-03-07 18:42:05 +00:00
parent bfb74d3155
commit 8559f97efb
6 changed files with 67 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
Log.cpp
View File

@@ -30,14 +30,13 @@
#include <ctime>
#include <cassert>
static std::string m_path;
static std::string m_root;
static unsigned int m_fileLevel = 2U;
static std::string m_filePath;
static std::string m_fileRoot;
static FILE* m_fpLog = NULL;
static bool m_display = true;
static unsigned int m_level = 2U;
static unsigned int m_displayLevel = 2U;
static struct tm m_tm;
@@ -45,6 +44,9 @@ static char LEVELS[] = " DMIWEF";
static bool LogOpen()
{
if (m_fileLevel == 0U)
return true;
time_t now;
::time(&now);
@@ -60,9 +62,9 @@ static bool LogOpen()
char filename[50U];
#if defined(_WIN32) || defined(_WIN64)
::sprintf(filename, "%s\\%s-%04d-%02d-%02d.log", m_path.c_str(), m_root.c_str(), tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday);
::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);
#else
::sprintf(filename, "%s/%s-%04d-%02d-%02d.log", m_path.c_str(), m_root.c_str(), tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday);
::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");
@@ -71,11 +73,12 @@ static bool LogOpen()
return m_fpLog != NULL;
}
bool LogInitialise(const std::string& path, const std::string& root, bool display)
bool LogInitialise(const std::string& filePath, const std::string& fileRoot, unsigned int fileLevel, unsigned int displayLevel)
{
m_path = path;
m_root = root;
m_display = display;
m_filePath = filePath;
m_fileRoot = fileRoot;
m_fileLevel = fileLevel;
m_displayLevel = displayLevel;
return ::LogOpen();
}
@@ -85,58 +88,47 @@ void LogFinalise()
::fclose(m_fpLog);
}
void LogSetLevel(unsigned int level)
{
m_level = level;
}
void Log(unsigned int level, const char* fmt, ...)
{
assert(level < 7U);
assert(fmt != NULL);
if (level < m_level)
return;
bool ret = ::LogOpen();
if (!ret)
return;
char buffer[300U];
#if defined(_WIN32) || defined(_WIN64)
SYSTEMTIME st;
::GetSystemTime(&st);
::fprintf(m_fpLog, "%c: %04u-%02u-%02u %02u:%02u:%02u.%03u ", LEVELS[level], st.wYear, st.wMonth, st.wDay, st.wHour, st.wMinute, st.wSecond, st.wMilliseconds);
if (m_display)
::fprintf(stdout, "%c: %04u-%02u-%02u %02u:%02u:%02u.%03u ", LEVELS[level], st.wYear, st.wMonth, st.wDay, st.wHour, st.wMinute, st.wSecond, st.wMilliseconds);
::sprintf(buffer, "%c: %04u-%02u-%02u %02u:%02u:%02u.%03u ", LEVELS[level], st.wYear, st.wMonth, st.wDay, st.wHour, st.wMinute, st.wSecond, st.wMilliseconds);
#else
struct timeval now;
::gettimeofday(&now, NULL);
struct tm* tm = ::gmtime(&now.tv_sec);
struct tm* tm = ::gmtime(&now.tv_sec);
::fprintf(m_fpLog, "%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);
if (m_display)
::fprintf(stdout, "%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.%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);
#endif
va_list vl;
va_start(vl, fmt);
va_list vl;
va_start(vl, fmt);
char buffer[200U];
::vsprintf(buffer, fmt, vl);
::vsprintf(buffer + ::strlen(buffer), fmt, vl);
va_end(vl);
::fprintf(m_fpLog, "%s\n", buffer);
::fflush(m_fpLog);
if (level >= m_fileLevel && m_fileLevel != 0U) {
bool ret = ::LogOpen();
if (!ret)
return;
if (m_display) {
::fprintf(stdout, "%s\n", buffer);
::fprintf(m_fpLog, "%s\n", buffer);
::fflush(m_fpLog);
}
if (level >= m_displayLevel && m_displayLevel != 0U) {
::fprintf(stdout, "%s\n", buffer);
::fflush(stdout);
}
if (level == 6U) { // Fatal
if (level == 6U) { // Fatal
::fclose(m_fpLog);
exit(1);
}