Various logging adjustments

This commit is contained in:
Akkadius 2015-01-20 03:20:40 -06:00
parent e79c1c1a5a
commit 42dffec4ae
4 changed files with 8 additions and 6 deletions

View File

@ -134,7 +134,7 @@ void EQEmuLogSys::ProcessLogWrite(uint16 debug_level, uint16 log_category, std::
EQEmuLogSys::SetCurrentTimeStamp(time_stamp); EQEmuLogSys::SetCurrentTimeStamp(time_stamp);
if (process_log){ if (process_log){
process_log << time_stamp << " " << StringFormat("[%s] ", Logs::LogCategoryName[log_category]).c_str() << message << std::endl; process_log << time_stamp << " " << message << std::endl;
} }
} }

View File

@ -140,7 +140,9 @@ public:
}; };
LogSettings log_settings[Logs::LogCategory::MaxCategoryID]; LogSettings log_settings[Logs::LogCategory::MaxCategoryID];
bool log_settings_loaded = false; bool log_settings_loaded = false;
int log_platform = 0; int log_platform = 0;
uint16 GetGMSayColorFromCategory(uint16 log_category); uint16 GetGMSayColorFromCategory(uint16 log_category);
@ -152,9 +154,9 @@ private:
std::function<void(uint16 log_category, std::string&)> on_log_gmsay_hook; std::function<void(uint16 log_category, std::string&)> on_log_gmsay_hook;
std::string FormatOutMessageString(uint16 log_category, std::string in_message); std::string FormatOutMessageString(uint16 log_category, std::string in_message);
std::string GetLinuxConsoleColorFromCategory(uint16 log_category);
uint16 GetWindowsConsoleColorFromCategory(uint16 log_category); uint16 GetWindowsConsoleColorFromCategory(uint16 log_category);
std::string GetLinuxConsoleColorFromCategory(uint16 log_category);
void ProcessConsoleMessage(uint16 debug_level, uint16 log_category, const 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 ProcessGMSay(uint16 debug_level, uint16 log_category, std::string message);

View File

@ -100,7 +100,7 @@ XS(XS_EQEmuIO_PRINT)
int len = 0; int len = 0;
for(i = 0; *cur != '\0'; i++, cur++) { for(i = 0; *cur != '\0'; i++, cur++) {
if(*cur == '\n') { if(*cur == '\n') {
Log.Out(Logs::Detail, Logs::Quests, str); Log.Out(Logs::General, Logs::Quests, str);
len = 0; len = 0;
pos = i+1; pos = i+1;
} else { } else {
@ -108,7 +108,7 @@ XS(XS_EQEmuIO_PRINT)
} }
} }
if(len > 0) { if(len > 0) {
Log.Out(Logs::Detail, Logs::Quests, str); Log.Out(Logs::General, Logs::Quests, str);
} }
} }

View File

@ -3028,11 +3028,11 @@ void ClientTaskState::ProcessTaskProximities(Client *c, float X, float Y, float
if((LastX==X) && (LastY==Y) && (LastZ==Z)) return; if((LastX==X) && (LastY==Y) && (LastZ==Z)) return;
Log.Out(Logs::General, Logs::Tasks, "[PROXIMITY] Checking proximities for Position %8.3f, %8.3f, %8.3f\n", X, Y, Z); Log.Out(Logs::General, Logs::Tasks, "[PROXIMITY] Checking proximities for Position %8.3f, %8.3f, %8.3f", X, Y, Z);
int ExploreID = taskmanager->ProximityManager.CheckProximities(X, Y, Z); int ExploreID = taskmanager->ProximityManager.CheckProximities(X, Y, Z);
if(ExploreID>0) { if(ExploreID>0) {
Log.Out(Logs::General, Logs::Tasks, "[PROXIMITY] Position %8.3f, %8.3f, %8.3f is within proximity %i\n", X, Y, Z, ExploreID); Log.Out(Logs::General, Logs::Tasks, "[PROXIMITY] Position %8.3f, %8.3f, %8.3f is within proximity %i", X, Y, Z, ExploreID);
UpdateTasksOnExplore(c, ExploreID); UpdateTasksOnExplore(c, ExploreID);
} }
} }