pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-19 04:01:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

More moving around of internal EQEmuLogSys functions

Browse Source
This commit is contained in:
Akkadius 2015-01-14 05:12:01 -06:00
parent 99a0012bdd
commit bdd170df6c
3 changed files with 81 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

145
common/eqemu_logsys.cpp
View File

@ -18,8 +18,8 @@
#include "eqemu_logsys.h" #include "eqemu_logsys.h"
#include "string_util.h"
#include "platform.h" #include "platform.h"
#include "string_util.h"
#include <iostream> #include <iostream>
#include <fstream> #include <fstream>
@ -126,15 +126,6 @@ void EQEmuLogSys::LoadLogSettings()
log_settings_loaded = true; log_settings_loaded = true;
} }
void EQEmuLogSys::StartLogs(const std::string log_name)
{
if (EQEmuLogSys::log_platform == EQEmuExePlatform::ExePlatformZone){
std::cout << "Starting Zone Logs..." << std::endl;
EQEmuLogSys::MakeDirectory("logs/zone");
process_log.open(StringFormat("logs/zone/%s.txt", log_name.c_str()), std::ios_base::app | std::ios_base::out);
}
}
std::string EQEmuLogSys::FormatDebugCategoryMessageString(uint16 log_category, std::string in_message){ std::string EQEmuLogSys::FormatDebugCategoryMessageString(uint16 log_category, std::string in_message){
std::string category_string = ""; std::string category_string = "";
if (log_category > 0 && LogCategoryName[log_category]){ if (log_category > 0 && LogCategoryName[log_category]){
@ -143,20 +134,7 @@ std::string EQEmuLogSys::FormatDebugCategoryMessageString(uint16 log_category, s
return StringFormat("%s%s", category_string.c_str(), in_message.c_str()); return StringFormat("%s%s", category_string.c_str(), in_message.c_str());
} }
void EQEmuLogSys::LogDebugType(DebugLevel debug_level, uint16 log_category, std::string message, ...)
{
va_list args;
va_start(args, message);
std::string output_message = vStringFormat(message.c_str(), args);
va_end(args);
std::string output_debug_message = EQEmuLogSys::FormatDebugCategoryMessageString(log_category, output_message);
EQEmuLogSys::ProcessGMSay(EQEmuLogSys::Debug, output_debug_message);
EQEmuLogSys::ConsoleMessage(EQEmuLogSys::Debug, output_debug_message);
EQEmuLogSys::ProcessLogWrite(EQEmuLogSys::Debug, output_debug_message);
}
void EQEmuLogSys::ProcessGMSay(uint16 log_type, std::string message){ void EQEmuLogSys::ProcessGMSay(uint16 log_type, std::string message){
if (EQEmuLogSys::log_platform == EQEmuExePlatform::ExePlatformZone){ if (EQEmuLogSys::log_platform == EQEmuExePlatform::ExePlatformZone){
@ -176,6 +154,51 @@ void EQEmuLogSys::ProcessLogWrite(uint16 log_type, std::string message){
} }
} }
void EQEmuLogSys::ProcessConsoleMessage(uint16 log_type, const std::string message)
{
if (log_type > EQEmuLogSys::MaxLogID){
return;
}
#ifdef _WINDOWS
HANDLE console_handle;
console_handle = GetStdHandle(STD_OUTPUT_HANDLE);
CONSOLE_FONT_INFOEX info = { 0 };
info.cbSize = sizeof(info);
info.dwFontSize.Y = 12; // leave X as zero
info.FontWeight = FW_NORMAL;
wcscpy(info.FaceName, L"Lucida Console");
SetCurrentConsoleFontEx(console_handle, NULL, &info);
if (LogColors[log_type]){
SetConsoleTextAttribute(console_handle, LogColors[log_type]);
}
else{
SetConsoleTextAttribute(console_handle, Console::Color::White);
}
#endif
std::cout << "[N::" << TypeNames[log_type] << "] " << message << "\n";
#ifdef _WINDOWS
/* Always set back to white*/
SetConsoleTextAttribute(console_handle, Console::Color::White);
#endif
}
void EQEmuLogSys::LogDebugType(DebugLevel debug_level, uint16 log_category, std::string message, ...)
{
va_list args;
va_start(args, message);
std::string output_message = vStringFormat(message.c_str(), args);
va_end(args);
std::string output_debug_message = EQEmuLogSys::FormatDebugCategoryMessageString(log_category, output_message);
EQEmuLogSys::ProcessConsoleMessage(EQEmuLogSys::Debug, output_debug_message);
EQEmuLogSys::ProcessGMSay(EQEmuLogSys::Debug, output_debug_message);
EQEmuLogSys::ProcessLogWrite(EQEmuLogSys::Debug, output_debug_message);
}
void EQEmuLogSys::LogDebug(DebugLevel debug_level, std::string message, ...) void EQEmuLogSys::LogDebug(DebugLevel debug_level, std::string message, ...)
{ {
va_list args; va_list args;
@ -183,11 +206,27 @@ void EQEmuLogSys::LogDebug(DebugLevel debug_level, std::string message, ...)
std::string output_message = vStringFormat(message.c_str(), args); std::string output_message = vStringFormat(message.c_str(), args);
va_end(args); va_end(args);
EQEmuLogSys::ProcessConsoleMessage(EQEmuLogSys::Debug, output_message);
EQEmuLogSys::ProcessGMSay(EQEmuLogSys::Debug, output_message); EQEmuLogSys::ProcessGMSay(EQEmuLogSys::Debug, output_message);
EQEmuLogSys::ConsoleMessage(EQEmuLogSys::Debug, output_message);
EQEmuLogSys::ProcessLogWrite(EQEmuLogSys::Debug, output_message); EQEmuLogSys::ProcessLogWrite(EQEmuLogSys::Debug, output_message);
} }
void EQEmuLogSys::Log(uint16 log_type, const std::string message, ...)
{
if (log_type > EQEmuLogSys::MaxLogID){
return;
}
va_list args;
va_start(args, message);
std::string output_message = vStringFormat(message.c_str(), args);
va_end(args);
EQEmuLogSys::ProcessConsoleMessage(log_type, output_message);
EQEmuLogSys::ProcessGMSay(log_type, output_message);
EQEmuLogSys::ProcessLogWrite(log_type, output_message);
}
void EQEmuLogSys::SetCurrentTimeStamp(char* time_stamp){ void EQEmuLogSys::SetCurrentTimeStamp(char* time_stamp){
time_t raw_time; time_t raw_time;
struct tm * time_info; struct tm * time_info;
@ -204,57 +243,19 @@ void EQEmuLogSys::MakeDirectory(std::string directory_name){
#endif #endif
} }
void EQEmuLogSys::Log(uint16 log_type, const std::string message, ...) void EQEmuLogSys::CloseFileLogs()
{
if (log_type > EQEmuLogSys::MaxLogID){
return;
}
va_list args;
va_start(args, message);
std::string output_message = vStringFormat(message.c_str(), args);
va_end(args);
EQEmuLogSys::ProcessGMSay(log_type, output_message);
EQEmuLogSys::ConsoleMessage(log_type, output_message);
EQEmuLogSys::ProcessLogWrite(log_type, output_message);
}
void EQEmuLogSys::ConsoleMessage(uint16 log_type, const std::string message)
{
if (log_type > EQEmuLogSys::MaxLogID){
return;
}
#ifdef _WINDOWS
HANDLE console_handle;
console_handle = GetStdHandle(STD_OUTPUT_HANDLE);
CONSOLE_FONT_INFOEX info = { 0 };
info.cbSize = sizeof(info);
info.dwFontSize.Y = 12; // leave X as zero
info.FontWeight = FW_NORMAL;
wcscpy(info.FaceName, L"Lucida Console");
SetCurrentConsoleFontEx(console_handle, NULL, &info);
if (LogColors[log_type]){
SetConsoleTextAttribute(console_handle, LogColors[log_type]);
}
else{
SetConsoleTextAttribute(console_handle, Console::Color::White);
}
#endif
std::cout << "[N::" << TypeNames[log_type] << "] " << message << "\n";
#ifdef _WINDOWS
/* Always set back to white*/
SetConsoleTextAttribute(console_handle, Console::Color::White);
#endif
}
void EQEmuLogSys::CloseZoneLogs()
{ {
if (EQEmuLogSys::log_platform == EQEmuExePlatform::ExePlatformZone){ if (EQEmuLogSys::log_platform == EQEmuExePlatform::ExePlatformZone){
std::cout << "Closing down zone logs..." << std::endl; std::cout << "Closing down zone logs..." << std::endl;
process_log.close(); process_log.close();
} }
} }
void EQEmuLogSys::StartFileLogs(const std::string log_name)
{
if (EQEmuLogSys::log_platform == EQEmuExePlatform::ExePlatformZone){
std::cout << "Starting Zone Logs..." << std::endl;
EQEmuLogSys::MakeDirectory("logs/zone");
process_log.open(StringFormat("logs/zone/%s.txt", log_name.c_str()), std::ios_base::app | std::ios_base::out);
}
}

10
common/eqemu_logsys.h
View File

@ -73,15 +73,15 @@ public:
MaxCategoryID /* Don't Remove this*/ MaxCategoryID /* Don't Remove this*/
}; };
void CloseZoneLogs(); void CloseFileLogs();
void ConsoleMessage(uint16 log_type, const std::string message);
void LoadLogSettings(); void LoadLogSettings();
void Log(uint16 log_type, const std::string message, ...); void Log(uint16 log_type, const std::string message, ...);
void LogDebug(DebugLevel debug_level, std::string message, ...); void LogDebug(DebugLevel debug_level, std::string message, ...);
void LogDebugType(DebugLevel debug_level, uint16 log_category, std::string message, ...); void LogDebugType(DebugLevel debug_level, uint16 log_category, std::string message, ...);
void MakeDirectory(std::string directory_name); void MakeDirectory(std::string directory_name);
void SetCurrentTimeStamp(char* time_stamp); void SetCurrentTimeStamp(char* time_stamp);
void StartLogs(const std::string log_name); void StartFileLogs(const std::string log_name);
struct LogSettings{ struct LogSettings{
uint8 log_to_file; uint8 log_to_file;
@ -99,9 +99,11 @@ private:
bool zone_general_init = false; bool zone_general_init = false;
std::function<void(uint16 log_type, std::string&)> on_log_gmsay_hook; std::function<void(uint16 log_type, std::string&)> on_log_gmsay_hook;
std::string FormatDebugCategoryMessageString(uint16 log_category, std::string in_message);
void ProcessConsoleMessage(uint16 log_type, const std::string message);
void ProcessGMSay(uint16 log_type, std::string message); void ProcessGMSay(uint16 log_type, std::string message);
void ProcessLogWrite(uint16 log_type, std::string message); void ProcessLogWrite(uint16 log_type, std::string message);
std::string FormatDebugCategoryMessageString(uint16 log_category, std::string in_message);
}; };
extern EQEmuLogSys logger; extern EQEmuLogSys logger;

4
zone/zone.cpp
View File

@ -152,7 +152,7 @@ bool Zone::Bootup(uint32 iZoneID, uint32 iInstanceID, bool iStaticZone) {
/* Set Logging */ /* Set Logging */
logger.StartLogs(StringFormat("%s_ver-%u_instid-%u_port-%u", zone->GetShortName(), zone->GetInstanceVersion(), zone->GetInstanceID(), ZoneConfig::get()->ZonePort)); logger.StartFileLogs(StringFormat("%s_ver-%u_instid-%u_port-%u", zone->GetShortName(), zone->GetInstanceVersion(), zone->GetInstanceID(), ZoneConfig::get()->ZonePort));
return true; return true;
} }
@ -720,7 +720,7 @@ void Zone::Shutdown(bool quite)
parse->ReloadQuests(true); parse->ReloadQuests(true);
UpdateWindowTitle(); UpdateWindowTitle();
logger.CloseZoneLogs(); logger.CloseFileLogs();
} }
void Zone::LoadZoneDoors(const char* zone, int16 version) void Zone::LoadZoneDoors(const char* zone, int16 version)