diff --git a/common/eqemu_logsys.h b/common/eqemu_logsys.h index 17ebdeaea..c388b4a37 100644 --- a/common/eqemu_logsys.h +++ b/common/eqemu_logsys.h @@ -156,9 +156,9 @@ private: uint16 GetWindowsConsoleColorFromCategory(uint16 log_category); std::string GetLinuxConsoleColorFromCategory(uint16 log_category); - void ProcessConsoleMessage(uint16 log_category, const std::string message); - void ProcessGMSay(uint16 log_category, std::string message); - void ProcessLogWrite(uint16 log_category, std::string message); + void ProcessConsoleMessage(uint16 debug_level, uint16 log_category, const std::string message); + void ProcessGMSay(uint16 debug_level, uint16 log_category, std::string message); + void ProcessLogWrite(uint16 debug_level, uint16 log_category, std::string message); }; extern EQEmuLogSys Log; diff --git a/common/tcp_connection.cpp b/common/tcp_connection.cpp index 6a8493f2e..7a393c8f5 100644 --- a/common/tcp_connection.cpp +++ b/common/tcp_connection.cpp @@ -899,7 +899,7 @@ ThreadReturnType TCPConnection::TCPConnectionLoop(void* tmp) { } TCPConnection* tcpc = (TCPConnection*) tmp; #ifndef WIN32 - Log.Out(Logs::Detail, Logs::TCP_Connection, __FUNCTION__ " Starting TCPConnectionLoop with thread ID %d", pthread_self()); + Log.Out(Logs::Detail, Logs::TCP_Connection, "%s Starting TCPConnectionLoop with thread ID %d", __FUNCTION__, pthread_self()); #endif tcpc->MLoopRunning.lock(); while (tcpc->RunLoop()) { @@ -926,7 +926,7 @@ ThreadReturnType TCPConnection::TCPConnectionLoop(void* tmp) { tcpc->MLoopRunning.unlock(); #ifndef WIN32 - Log.Out(Logs::Detail, Logs::TCP_Connection, __FUNCTION__ "Ending TCPConnectionLoop with thread ID %d", pthread_self()); + Log.Out(Logs::Detail, Logs::TCP_Connection, "%s Ending TCPConnectionLoop with thread ID %d", __FUNCTION__, pthread_self()); #endif THREAD_RETURN(nullptr);