g4klx/ircDDBGateway
1
0
Fork 0
mirror of https://github.com/g4klx/ircDDBGateway.git synced 2025-12-06 05:32:02 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

add debug param to reduce logs

Browse source
This commit is contained in:
Shawn Chain 2018-10-07 00:47:15 +08:00
parent 1e933b4120
commit e3facce658
5 changed files with 31 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Common/Logger.cpp
View file

@ -80,7 +80,13 @@ void CLogger::DoLogRecord(wxLogLevel level, const wxString& msg, const wxLogReco
default: letter = wxT("U"); break; default: letter = wxT("U"); break;
} }
struct tm* tm = ::gmtime(&info.timestamp); bool utc = false;
struct tm* tm;
if (utc){
tm = ::gmtime(&info.timestamp);
}else{
tm = ::localtime(&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.c_str()); 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());

1
Common/XLXHostsFileDownloader.cpp
View file

@ -29,6 +29,7 @@ wxString CXLXHostsFileDownloader::Download(const wxString & xlxHostsFileURL)
{ {
#ifdef XLX_USE_WGET #ifdef XLX_USE_WGET
wxString xlxHostsFileName = wxFileName::CreateTempFileName(_T("XLX_Hosts_")); wxString xlxHostsFileName = wxFileName::CreateTempFileName(_T("XLX_Hosts_"));
wxLogMessage(_T("Downloading XLX host file..."));
wxString commandLine = _T("wget -q -O ") + xlxHostsFileName + _T(" ") + xlxHostsFileURL; wxString commandLine = _T("wget -q -O ") + xlxHostsFileName + _T(" ") + xlxHostsFileURL;
bool execResult = wxShell(commandLine); bool execResult = wxShell(commandLine);

14
ircDDBGateway/IRCDDBGatewayAppD.cpp
View file

@ -49,6 +49,7 @@ const wxChar* NOLOGGING_SWITCH = wxT("nolog");
const wxChar* LOGDIR_OPTION = wxT("logdir"); const wxChar* LOGDIR_OPTION = wxT("logdir");
const wxChar* CONFDIR_OPTION = wxT("confdir"); const wxChar* CONFDIR_OPTION = wxT("confdir");
const wxChar* DAEMON_SWITCH = wxT("daemon"); const wxChar* DAEMON_SWITCH = wxT("daemon");
const wxChar* DEBUG_SWITCH = wxT("debug");
const wxString LOG_BASE_NAME = wxT(LOG_BASE); const wxString LOG_BASE_NAME = wxT(LOG_BASE);
@ -70,6 +71,7 @@ int main(int argc, char** argv)
wxCmdLineParser parser(argc, argv); wxCmdLineParser parser(argc, argv);
parser.AddSwitch(NOLOGGING_SWITCH, wxEmptyString, wxEmptyString, wxCMD_LINE_PARAM_OPTIONAL); parser.AddSwitch(NOLOGGING_SWITCH, wxEmptyString, wxEmptyString, wxCMD_LINE_PARAM_OPTIONAL);
parser.AddSwitch(DAEMON_SWITCH, wxEmptyString, wxEmptyString, wxCMD_LINE_PARAM_OPTIONAL); parser.AddSwitch(DAEMON_SWITCH, wxEmptyString, wxEmptyString, wxCMD_LINE_PARAM_OPTIONAL);
parser.AddSwitch(DEBUG_SWITCH, wxEmptyString, wxEmptyString, wxCMD_LINE_PARAM_OPTIONAL);
parser.AddOption(LOGDIR_OPTION, wxEmptyString, wxEmptyString, wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL); parser.AddOption(LOGDIR_OPTION, wxEmptyString, wxEmptyString, wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL);
parser.AddOption(CONFDIR_OPTION, wxEmptyString, wxEmptyString, wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL); parser.AddOption(CONFDIR_OPTION, wxEmptyString, wxEmptyString, wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL);
parser.AddParam(NAME_PARAM, wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL); parser.AddParam(NAME_PARAM, wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL);
@ -82,6 +84,7 @@ int main(int argc, char** argv)
bool nolog = parser.Found(NOLOGGING_SWITCH); bool nolog = parser.Found(NOLOGGING_SWITCH);
bool daemon = parser.Found(DAEMON_SWITCH); bool daemon = parser.Found(DAEMON_SWITCH);
bool debug = parser.Found(DEBUG_SWITCH);
wxString logDir; wxString logDir;
bool found = parser.Found(LOGDIR_OPTION, &logDir); bool found = parser.Found(LOGDIR_OPTION, &logDir);
@ -137,7 +140,7 @@ int main(int argc, char** argv)
::fclose(fp); ::fclose(fp);
} }
m_gateway = new CIRCDDBGatewayAppD(nolog, logDir, confDir, name); m_gateway = new CIRCDDBGatewayAppD(nolog, debug, logDir, confDir, name);
if (!m_gateway->init()) { if (!m_gateway->init()) {
::wxUninitialize(); ::wxUninitialize();
return 1; return 1;
@ -156,9 +159,10 @@ int main(int argc, char** argv)
return 0; return 0;
} }
CIRCDDBGatewayAppD::CIRCDDBGatewayAppD(bool nolog, const wxString& logDir, const wxString& confDir, const wxString& name) : CIRCDDBGatewayAppD::CIRCDDBGatewayAppD(bool nolog, bool debug, const wxString& logDir, const wxString& confDir, const wxString& name) :
m_name(name), m_name(name),
m_nolog(nolog), m_nolog(nolog),
m_debug(debug),
m_logDir(logDir), m_logDir(logDir),
m_confDir(confDir), m_confDir(confDir),
m_thread(NULL), m_thread(NULL),
@ -184,7 +188,13 @@ bool CIRCDDBGatewayAppD::init()
wxLog* log = new CLogger(m_logDir, logBaseName); wxLog* log = new CLogger(m_logDir, logBaseName);
wxLog::SetActiveTarget(log); wxLog::SetActiveTarget(log);
if (m_debug){
wxLog::SetVerbose(); wxLog::SetVerbose();
wxLog::SetLogLevel(wxLOG_Debug);
}else{
wxLog::SetVerbose(false);
wxLog::SetLogLevel(wxLOG_Message);
}
} else { } else {
new wxLogNull; new wxLogNull;
} }

3
ircDDBGateway/IRCDDBGatewayAppD.h
View file

@ -28,7 +28,7 @@
class CIRCDDBGatewayAppD { class CIRCDDBGatewayAppD {
public: public:
CIRCDDBGatewayAppD(bool nolog, const wxString& logDir, const wxString& confDir, const wxString& name); CIRCDDBGatewayAppD(bool nolog, bool debug, const wxString& logDir, const wxString& confDir, const wxString& name);
~CIRCDDBGatewayAppD(); ~CIRCDDBGatewayAppD();
bool init(); bool init();
@ -40,6 +40,7 @@ public:
private: private:
wxString m_name; wxString m_name;
bool m_nolog; bool m_nolog;
bool m_debug;
wxString m_logDir; wxString m_logDir;
wxString m_confDir; wxString m_confDir;
CIRCDDBGatewayThread* m_thread; CIRCDDBGatewayThread* m_thread;

16
ircDDBGateway/IRCDDBGatewayThread.cpp
View file

@ -684,19 +684,19 @@ void CIRCDDBGatewayThread::processIrcDDB()
case 0: case 0:
case 10: case 10:
if (m_lastStatus != IS_DISCONNECTED) { if (m_lastStatus != IS_DISCONNECTED) {
wxLogInfo(wxT("Disconnected from ircDDB")); wxLogMessage(wxT("Disconnected from ircDDB"));
m_lastStatus = IS_DISCONNECTED; m_lastStatus = IS_DISCONNECTED;
} }
break; break;
case 7: case 7:
if (m_lastStatus != IS_CONNECTED) { if (m_lastStatus != IS_CONNECTED) {
wxLogInfo(wxT("Connected to ircDDB")); wxLogMessage(wxT("Connected to ircDDB"));
m_lastStatus = IS_CONNECTED; m_lastStatus = IS_CONNECTED;
} }
break; break;
default: default:
if (m_lastStatus != IS_CONNECTING) { if (m_lastStatus != IS_CONNECTING) {
wxLogInfo(wxT("Connecting to ircDDB")); wxLogMessage(wxT("Connecting to ircDDB"));
m_lastStatus = IS_CONNECTING; m_lastStatus = IS_CONNECTING;
} }
break; break;
@ -717,10 +717,10 @@ void CIRCDDBGatewayThread::processIrcDDB()
break; break;
if (!address.IsEmpty()) { if (!address.IsEmpty()) {
wxLogMessage(wxT("USER: %s %s %s %s"), user.c_str(), repeater.c_str(), gateway.c_str(), address.c_str()); wxLogInfo(wxT("USER: %s %s %s %s"), user.c_str(), repeater.c_str(), gateway.c_str(), address.c_str());
m_cache.updateUser(user, repeater, gateway, address, timestamp, DP_DEXTRA, false, false); m_cache.updateUser(user, repeater, gateway, address, timestamp, DP_DEXTRA, false, false);
} else { } else {
wxLogMessage(wxT("USER: %s NOT FOUND"), user.c_str()); wxLogInfo(wxT("USER: %s NOT FOUND"), user.c_str());
} }
} }
break; break;
@ -733,7 +733,7 @@ void CIRCDDBGatewayThread::processIrcDDB()
CRepeaterHandler::resolveRepeater(repeater, gateway, address, DP_DEXTRA); CRepeaterHandler::resolveRepeater(repeater, gateway, address, DP_DEXTRA);
if (!address.IsEmpty()) { if (!address.IsEmpty()) {
wxLogMessage(wxT("REPEATER: %s %s %s"), repeater.c_str(), gateway.c_str(), address.c_str()); wxLogInfo(wxT("REPEATER: %s %s %s"), repeater.c_str(), gateway.c_str(), address.c_str());
m_cache.updateRepeater(repeater, gateway, address, DP_DEXTRA, false, false); m_cache.updateRepeater(repeater, gateway, address, DP_DEXTRA, false, false);
} else { } else {
wxLogMessage(wxT("REPEATER: %s NOT FOUND"), repeater.c_str()); wxLogMessage(wxT("REPEATER: %s NOT FOUND"), repeater.c_str());
@ -750,7 +750,7 @@ void CIRCDDBGatewayThread::processIrcDDB()
CDExtraHandler::gatewayUpdate(gateway, address); CDExtraHandler::gatewayUpdate(gateway, address);
CDPlusHandler::gatewayUpdate(gateway, address); CDPlusHandler::gatewayUpdate(gateway, address);
if (!address.IsEmpty()) { if (!address.IsEmpty()) {
wxLogMessage(wxT("GATEWAY: %s %s"), gateway.c_str(), address.c_str()); wxLogInfo(wxT("GATEWAY: %s %s"), gateway.c_str(), address.c_str());
m_cache.updateGateway(gateway, address, DP_DEXTRA, false, false); m_cache.updateGateway(gateway, address, DP_DEXTRA, false, false);
} else { } else {
wxLogMessage(wxT("GATEWAY: %s NOT FOUND"), gateway.c_str()); wxLogMessage(wxT("GATEWAY: %s NOT FOUND"), gateway.c_str());
@ -794,7 +794,7 @@ void CIRCDDBGatewayThread::processRepeater(IRepeaterProtocolHandler* handler)
if (!repeater.IsSameAs(user)) { if (!repeater.IsSameAs(user)) {
CRepeaterHandler* handler = CRepeaterHandler::findDVRepeater(repeater); CRepeaterHandler* handler = CRepeaterHandler::findDVRepeater(repeater);
if (handler == NULL) if (handler == NULL)
wxLogMessage(wxT("Heard received from unknown repeater, %s"), repeater.c_str()); wxLogInfo(wxT("Heard received from unknown repeater, %s"), repeater.c_str());
else else
handler->processRepeater(*heard); handler->processRepeater(*heard);