g4klx/ircDDBGateway
1
0
Fork 0
mirror of https://github.com/g4klx/ircDDBGateway.git synced 2026-01-06 08:19:59 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update logger to the latest wxWidgets API.

Browse source
This commit is contained in:
Jonathan Naylor 2019-01-16 20:51:23 +00:00
parent c2e26c508e
commit 875bba83c1
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
Common/Logger.cpp
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2002,2003,2009,2011,2012 by Jonathan Naylor G4KLX * Copyright (C) 2002,2003,2009,2011,2012,2019 by Jonathan Naylor G4KLX
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@ -55,11 +55,10 @@ CLogger::~CLogger()
delete m_file; delete m_file;
} }
void CLogger::DoLog(wxLogLevel level, const wxChar* msg, time_t timestamp) void CLogger::DoLogRecord(wxLogLevel level, const wxString& msg, const wxLogRecordInfo& info)
{ {
wxASSERT(m_file != NULL); wxASSERT(m_file != NULL);
wxASSERT(m_file->IsOpened()); wxASSERT(m_file->IsOpened());
wxASSERT(msg != NULL);
wxString letter; wxString letter;
@ -75,18 +74,18 @@ void CLogger::DoLog(wxLogLevel level, const wxChar* msg, time_t timestamp)
default: letter = wxT("U"); break; default: letter = wxT("U"); break;
} }
struct tm* tm = ::gmtime(&timestamp); struct tm* tm = ::gmtime(&info.timestamp);
wxString message; wxString message;
message.Printf(wxT("%s: %04d-%02d-%02d %02d:%02d:%02d: %s\n"), letter.c_str(), tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday, tm->tm_hour, tm->tm_min, tm->tm_sec, msg); message.Printf(wxT("%s: %04d-%02d-%02d %02d:%02d:%02d: %s\n"), letter.c_str(), tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday, tm->tm_hour, tm->tm_min, tm->tm_sec, msg.c_str());
DoLogString(message.c_str(), timestamp); writeLog(message.c_str(), info.timestamp);
if (level == wxLOG_FatalError) if (level == wxLOG_FatalError)
::abort(); ::abort();
} }
void CLogger::DoLogString(const wxChar* msg, time_t timestamp) void CLogger::writeLog(const wxChar* msg, time_t timestamp)
{ {
wxASSERT(m_file != NULL); wxASSERT(m_file != NULL);
wxASSERT(m_file->IsOpened()); wxASSERT(m_file->IsOpened());

7
Common/Logger.h
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2002,2003,2009,2011,2012 by Jonathan Naylor G4KLX * Copyright (C) 2002,2003,2009,2011,2012,2019 by Jonathan Naylor G4KLX
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@ -28,14 +28,15 @@ public:
CLogger(const wxString& directory, const wxString& name); CLogger(const wxString& directory, const wxString& name);
virtual ~CLogger(); virtual ~CLogger();
virtual void DoLog(wxLogLevel level, const wxChar* msg, time_t timestamp); virtual void DoLogRecord(wxLogLevel level, const wxString& msg, const wxLogRecordInfo& info);
virtual void DoLogString(const wxChar* msg, time_t timestamp);
private: private:
wxString m_name; wxString m_name;
wxFFile* m_file; wxFFile* m_file;
wxFileName m_fileName; wxFileName m_fileName;
int m_day; int m_day;
void writeLog(const wxChar* msg, time_t timestamp);
}; };
#endif #endif