[Logging] Logging Improvements (#2755)

* Console logging improvements

* stderr handling

* Add origination information

* Formatting

* Update zoneserver.cpp

* Update eqemu_logsys.cpp

* Remove semicolon from MySQLQuery log output

* Remove IsRfc5424LogCategory

* Remove no longer used functions

* Remove definition BUILD_LOGGING

* Deprecate categories UCSServer & WorldServer

* Deprecate UCS / World Server / Zone Server categories

* Deprecate Status, QSServer, Normal

* Update login_server.cpp

* Deprecate Emergency, Alert, Critical, Notice

* Deprecate Alert

* Fix terminal color resetting

* Deprecate headless client

* Move LogAIModerate to Detail

* Deprecate moderate logging level for detail

* Update logs.cpp

* Logs list simplify

* Update logs.cpp

* Add discord to log command

* Remove unused headers

* Windows fix

* Error in world when zones fail to load

* Show warning color properly

* Keep loginserver thread log from colliding with other logs during startup

* Deprecate Loginserver category

common/CMakeLists.txt

@@ -652,6 +652,7 @@ SET(common_headers
     patches/uf_limits.h
     patches/uf_ops.h
     patches/uf_structs.h
+    termcolor/rang.hpp
     stacktrace/backward.hpp
     StackWalker/StackWalker.h
     util/memory_stream.h

common/database.cpp

@@ -71,11 +71,11 @@ bool Database::Connect(const char* host, const char* user, const char* passwd, c
 	uint32 errnum= 0;
 	char errbuf[MYSQL_ERRMSG_SIZE];
 	if (!Open(host, user, passwd, database, port, &errnum, errbuf)) {
-		LogError("[MySQL] Connection [{}] Failed to connect to database: Error [{}]", connection_label, errbuf);
+		LogError("Connection [{}] Failed to connect to database Error [{}]", connection_label, errbuf);
 		return false;
 	}
 	else {
-		LogInfo("[MySQL] Connection [{}] database [{}] at [{}]:[{}]", connection_label, database, host,port);
+		LogInfo("Connected to database [{}] [{}] @ [{}:{}]", connection_label, database, host,port);
 		return true;
 	}
 }
@@ -975,6 +975,8 @@ bool Database::LoadVariables() {
 		varcache.Add(key, value);
 	}
 
+	LogInfo("Loaded [{}] variable(s)", Strings::Commify(std::to_string(results.RowCount())));
+
 	return true;
 }
 

common/dbcore.cpp

@@ -167,7 +167,7 @@ MySQLRequestResult DBcore::QueryDatabase(const char *query, uint32 querylen, boo
 	if (LogSys.log_settings[Logs::MySQLQuery].is_category_enabled == 1) {
 		if ((strncasecmp(query, "select", 6) == 0)) {
 			LogMySQLQuery(
-				"{0}; -- ({1} row{2} returned) ({3}s)",
+				"{0} -- ({1} row{2} returned) ({3}s)",
 				query,
 				requestResult.RowCount(),
 				requestResult.RowCount() == 1 ? "" : "s",
@@ -176,7 +176,7 @@ MySQLRequestResult DBcore::QueryDatabase(const char *query, uint32 querylen, boo
 		}
 		else {
 			LogMySQLQuery(
-				"{0}; -- ({1} row{2} affected) ({3}s)",
+				"{0} -- ({1} row{2} affected) ({3}s)",
 				query,
 				requestResult.RowsAffected(),
 				requestResult.RowsAffected() == 1 ? "" : "s",

common/eqemu_logsys.cpp

@@ -22,21 +22,19 @@
 #include "rulesys.h"
 #include "platform.h"
 #include "strings.h"
-#include "misc.h"
-#include "discord/discord.h"
 #include "repositories/discord_webhooks_repository.h"
 #include "repositories/logsys_categories_repository.h"
+#include "termcolor/rang.hpp"
 
 #include <iostream>
-#include <fstream>
 #include <string>
-#include <iomanip>
 #include <time.h>
 #include <sys/stat.h>
-#include <algorithm>
 
 std::ofstream process_log;
 
+#include <filesystem>
+
 #ifdef _WINDOWS
 #include <direct.h>
 #include <conio.h>
@@ -52,40 +50,6 @@ std::ofstream process_log;
 
 #endif
 
-/**
- * Linux ANSI console color defines
- */
-#define LC_RESET   "\033[0m"
-#define LC_BLACK   "\033[30m" /* Black */
-#define LC_RED     "\033[31m" /* Red */
-#define LC_GREEN   "\033[32m" /* Green */
-#define LC_YELLOW  "\033[33m" /* Yellow */
-#define LC_BLUE    "\033[34m" /* Blue */
-#define LC_MAGENTA "\033[35m" /* Magenta */
-#define LC_CYAN    "\033[36m" /* Cyan */
-#define LC_WHITE   "\033[37m" /* White */
-
-namespace Console {
-	enum Color {
-		Black        = 0,
-		Blue         = 1,
-		Green        = 2,
-		Cyan         = 3,
-		Red          = 4,
-		Magenta      = 5,
-		Brown        = 6,
-		LightGray    = 7,
-		DarkGray     = 8,
-		LightBlue    = 9,
-		LightGreen   = 10,
-		LightCyan    = 11,
-		LightRed     = 12,
-		LightMagenta = 13,
-		Yellow       = 14,
-		White        = 15
-	};
-}
-
 /**
  * EQEmuLogSys Constructor
  */
@@ -120,14 +84,8 @@ EQEmuLogSys *EQEmuLogSys::LoadLogSettingsDefaults()
 	/**
 	 * Set Defaults
 	 */
-	log_settings[Logs::WorldServer].log_to_console          = static_cast<uint8>(Logs::General);
-	log_settings[Logs::ZoneServer].log_to_console           = static_cast<uint8>(Logs::General);
-	log_settings[Logs::QSServer].log_to_console             = static_cast<uint8>(Logs::General);
-	log_settings[Logs::UCSServer].log_to_console            = static_cast<uint8>(Logs::General);
 	log_settings[Logs::Crash].log_to_console                = static_cast<uint8>(Logs::General);
 	log_settings[Logs::MySQLError].log_to_console           = static_cast<uint8>(Logs::General);
-	log_settings[Logs::Loginserver].log_to_console          = static_cast<uint8>(Logs::General);
-	log_settings[Logs::HeadlessClient].log_to_console       = static_cast<uint8>(Logs::General);
 	log_settings[Logs::NPCScaling].log_to_gmsay             = static_cast<uint8>(Logs::General);
 	log_settings[Logs::HotReload].log_to_gmsay              = static_cast<uint8>(Logs::General);
 	log_settings[Logs::HotReload].log_to_console            = static_cast<uint8>(Logs::General);
@@ -146,12 +104,8 @@ EQEmuLogSys *EQEmuLogSys::LoadLogSettingsDefaults()
 	/**
 	 * RFC 5424
 	 */
-	log_settings[Logs::Emergency].log_to_console = static_cast<uint8>(Logs::General);
-	log_settings[Logs::Alert].log_to_console     = static_cast<uint8>(Logs::General);
-	log_settings[Logs::Critical].log_to_console  = static_cast<uint8>(Logs::General);
 	log_settings[Logs::Error].log_to_console     = static_cast<uint8>(Logs::General);
 	log_settings[Logs::Warning].log_to_console   = static_cast<uint8>(Logs::General);
-	log_settings[Logs::Notice].log_to_console    = static_cast<uint8>(Logs::General);
 	log_settings[Logs::Info].log_to_console      = static_cast<uint8>(Logs::General);
 
 	/**
@@ -196,24 +150,6 @@ EQEmuLogSys *EQEmuLogSys::LoadLogSettingsDefaults()
 	return this;
 }
 
-/**
- * @param log_category
- * @return
- */
-bool EQEmuLogSys::IsRfc5424LogCategory(uint16 log_category)
-{
-	return (
-		log_category == Logs::Emergency ||
-		log_category == Logs::Alert ||
-		log_category == Logs::Critical ||
-		log_category == Logs::Error ||
-		log_category == Logs::Warning ||
-		log_category == Logs::Notice ||
-		log_category == Logs::Info ||
-		log_category == Logs::Debug
-	);
-}
-
 /**
  * @param debug_level
  * @param log_category
@@ -244,66 +180,6 @@ void EQEmuLogSys::ProcessLogWrite(
 	}
 }
 
-/**
- * @param log_category
- * @return
- */
-uint16 EQEmuLogSys::GetWindowsConsoleColorFromCategory(uint16 log_category)
-{
-	switch (log_category) {
-		case Logs::Status:
-		case Logs::Normal:
-			return Console::Color::Yellow;
-		case Logs::MySQLError:
-		case Logs::Error:
-		case Logs::QuestErrors:
-			return Console::Color::LightRed;
-		case Logs::MySQLQuery:
-		case Logs::Debug:
-			return Console::Color::LightGreen;
-		case Logs::Quests:
-			return Console::Color::LightCyan;
-		case Logs::Commands:
-		case Logs::Mercenaries:
-			return Console::Color::LightMagenta;
-		case Logs::Crash:
-			return Console::Color::LightRed;
-		default:
-			return Console::Color::Yellow;
-	}
-}
-
-/**
- * @param log_category
- * @return
- */
-std::string EQEmuLogSys::GetLinuxConsoleColorFromCategory(uint16 log_category)
-{
-	switch (log_category) {
-		case Logs::Status:
-		case Logs::Normal:
-			return LC_YELLOW;
-		case Logs::MySQLError:
-		case Logs::QuestErrors:
-		case Logs::Warning:
-		case Logs::Critical:
-		case Logs::Error:
-			return LC_RED;
-		case Logs::MySQLQuery:
-		case Logs::Debug:
-			return LC_GREEN;
-		case Logs::Quests:
-			return LC_CYAN;
-		case Logs::Commands:
-		case Logs::Mercenaries:
-			return LC_MAGENTA;
-		case Logs::Crash:
-			return LC_RED;
-		default:
-			return LC_YELLOW;
-	}
-}
-
 /**
  * @param log_category
  * @return
@@ -311,9 +187,6 @@ std::string EQEmuLogSys::GetLinuxConsoleColorFromCategory(uint16 log_category)
 uint16 EQEmuLogSys::GetGMSayColorFromCategory(uint16 log_category)
 {
 	switch (log_category) {
-		case Logs::Status:
-		case Logs::Normal:
-			return Chat::Yellow;
 		case Logs::MySQLError:
 		case Logs::QuestErrors:
 		case Logs::Error:
@@ -333,28 +206,139 @@ uint16 EQEmuLogSys::GetGMSayColorFromCategory(uint16 log_category)
 	}
 }
 
+
 /**
  * @param debug_level
  * @param log_category
  * @param message
  */
-void EQEmuLogSys::ProcessConsoleMessage(uint16 log_category, const std::string &message)
+void EQEmuLogSys::ProcessConsoleMessage(
+	uint16 log_category,
+	const std::string &message,
+	const char *file,
+	const char *func,
+	int line
+)
 {
-#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);
-	SetConsoleTextAttribute(console_handle, EQEmuLogSys::GetWindowsConsoleColorFromCategory(log_category));
-	std::cout << message << "\n";
-	SetConsoleTextAttribute(console_handle, Console::Color::White);
-#else
-	std::cout << EQEmuLogSys::GetLinuxConsoleColorFromCategory(log_category) << message << LC_RESET << std::endl;
-#endif
+	bool is_error = (
+		log_category == Logs::LogCategory::Error ||
+		log_category == Logs::LogCategory::MySQLError ||
+		log_category == Logs::LogCategory::QuestErrors
+	);
+	bool is_warning = (
+		log_category == Logs::LogCategory::Warning
+	);
+
+	(!is_error ? std::cout : std::cerr)
+		<< ""
+		<< rang::fgB::black
+		<< rang::style::bold
+		<< fmt::format("{:>6}", GetPlatformName().substr(0, 6))
+		<< rang::style::reset
+		<< rang::fgB::gray
+		<< " | "
+		<< (is_error || is_warning ? rang::fgB::red : rang::fgB::gray)
+		<< rang::style::bold
+		<< fmt::format("{:^10}", fmt::format("{}", Logs::LogCategoryName[log_category]).substr(0, 10))
+		<< rang::style::reset
+		<< rang::fgB::gray
+		<< " | "
+		<< rang::fgB::gray
+		<< rang::style::bold
+		<< fmt::format("{}", func)
+		<< " ";
+
+	if (RuleB(Logging, PrintFileFunctionAndLine)) {
+		(!is_error ? std::cout : std::cerr)
+			<< ""
+			<< rang::fgB::green
+			<< rang::style::bold
+			<< fmt::format("{:}", fmt::format("{}:{}:{}", std::filesystem::path(file).filename().string(), func, line))
+			<< rang::style::reset
+			<< " | ";
+	}
+
+	if (log_category == Logs::LogCategory::MySQLQuery) {
+		auto        s     = Strings::Split(message, "--");
+		std::string query = Strings::Trim(s[0]);
+		std::string meta  = Strings::Trim(s[1]);
+
+		std::cout <<
+				  rang::fgB::green
+				  <<
+				  query
+				  <<
+				  rang::style::reset;
+
+		std::cout <<
+				  rang::fgB::black
+				  <<
+				  " -- "
+				  <<
+				  meta
+				  <<
+				  rang::style::reset;
+	}
+	else if (Strings::Contains(message, "[")) {
+		for (auto &e: Strings::Split(message, " ")) {
+			if (Strings::Contains(e, "[") && Strings::Contains(e, "]")) {
+				e = Strings::Replace(e, "[", "");
+				e = Strings::Replace(e, "]", "");
+
+				bool is_upper = false;
+
+				for (int i = 0; i < strlen(e.c_str()); i++) {
+					if (isupper(e[i])) {
+						is_upper = true;
+					}
+				}
+
+				if (!is_upper) {
+					(!is_error ? std::cout : std::cerr)
+						<< rang::fgB::gray
+						<< "["
+						<< rang::style::bold
+						<< rang::fgB::yellow
+						<< e
+						<< rang::fgB::gray
+						<< "] "
+						;
+				}
+				else {
+					(!is_error ? std::cout : std::cerr) << rang::fgB::gray << "[" << e << "] ";
+				}
+			}
+			else {
+				(!is_error ? std::cout : std::cerr)
+					<< (is_error ? rang::fgB::red : rang::fgB::gray)
+					<< e
+					<< " ";
+			}
+		}
+	}
+	else {
+		(!is_error ? std::cout : std::cerr)
+			<< (is_error ? rang::fgB::red : rang::fgB::gray)
+			<< message
+			<< " ";
+	}
+
+	if (!origination_info.zone_short_name.empty()) {
+		(!is_error ? std::cout : std::cerr)
+			<<
+			rang::fgB::black
+			<<
+			"-- "
+			<<
+			fmt::format(
+				"[{}] ({}) inst_id [{}]",
+				origination_info.zone_short_name,
+				origination_info.zone_long_name,
+				origination_info.instance_id
+			);
+	}
+
+	(!is_error ? std::cout : std::cerr) << rang::style::reset << std::endl;
 
 	m_on_log_console_hook(log_category, message);
 }
@@ -368,33 +352,6 @@ constexpr const char *str_end(const char *str)
 	return *str ? str_end(str + 1) : str;
 }
 
-/**
- * @param str
- * @return
- */
-constexpr bool str_slant(const char *str)
-{
-	return *str == '/' ? true : (*str ? str_slant(str + 1) : false);
-}
-
-/**
- * @param str
- * @return
- */
-constexpr const char *r_slant(const char *str)
-{
-	return *str == '/' ? (str + 1) : r_slant(str - 1);
-}
-
-/**
- * @param str
- * @return
- */
-constexpr const char *base_file_name(const char *str)
-{
-	return str_slant(str) ? r_slant(str_end(str)) : str;
-}
-
 /**
  * Core logging function
  *
@@ -422,7 +379,7 @@ void EQEmuLogSys::Out(
 
 	std::string prefix;
 	if (RuleB(Logging, PrintFileFunctionAndLine)) {
-		prefix = fmt::format("[{0}::{1}:{2}] ", base_file_name(file), func, line);
+		prefix = fmt::format("[{0}::{1}:{2}] ", std::filesystem::path(file).filename().string(), func, line);
 	}
 
 	// remove this when we remove all legacy logs
@@ -445,7 +402,10 @@ void EQEmuLogSys::Out(
 	if (l.log_to_console_enabled) {
 		EQEmuLogSys::ProcessConsoleMessage(
 			log_category,
-			fmt::format("[{}] [{}] {}", GetPlatformName(), Logs::LogCategoryName[log_category], prefix + output_message)
+			output_message,
+			file,
+			func,
+			line
 		);
 	}
 	if (l.log_to_gmsay_enabled) {

common/eqemu_logsys.h

@@ -39,8 +39,7 @@
 namespace Logs {
 	enum DebugLevel {
 		General = 1,    // 1 - Low-Level general debugging, useful info on single line
-		Moderate,       // 2 - Informational based, used in functions, when particular things load
-		Detail          // 3 - Use this for extreme detail in logging, usually in extreme debugging in the stack or interprocess communication
+		Detail          // 2 - Use this for very chatty logging you want to leave in but don't want on by default
 	};
 
 	/**
@@ -54,7 +53,7 @@ namespace Logs {
 		AI,
 		Aggro,
 		Attack,
-		DeprecatedCS,
+		DeprecatedCS, // deprecated
 		Combat,
 		Commands,
 		Crash,
@@ -65,36 +64,36 @@ namespace Logs {
 		Inventory,
 		Launcher,
 		Netcode,
-		Normal,
+		Normal, // deprecated
 		Object,
 		Pathing,
-		QSServer,
+		QSServer, // deprecated
 		Quests,
 		Rules,
 		Skills,
 		Spawns,
 		Spells,
-		Status,
+		Status, // deprecated
 		TCPConnection,
 		Tasks,
 		Tradeskills,
 		Trading,
 		Tribute,
-		UCSServer,
-		WebInterfaceServer,
-		WorldServer,
-		ZoneServer,
+		UCSServer, // deprecated
+		WebInterfaceServer, // deprecated
+		WorldServer, // deprecated
+		ZoneServer, // deprecated
 		MySQLError,
 		MySQLQuery,
 		Mercenaries,
 		QuestDebug,
-		DeprecatedSC,
-		DeprecatedCSU,
-		DeprecatedSCD,
-		DeprecatedCSD,
-		Loginserver,
+		DeprecatedSC, // deprecated
+		DeprecatedCSU, // deprecated
+		DeprecatedSCD, // deprecated
+		DeprecatedCSD, // deprecated
+		Loginserver, // deprecated
 		ClientLogin,
-		HeadlessClient,
+		HeadlessClient, // deprecated
 		HPUpdate,
 		FixZ,
 		Food,
@@ -104,10 +103,10 @@ namespace Logs {
 		MobAppearance,
 		Info,
 		Warning,
-		Critical,
-		Emergency,
-		Alert,
-		Notice,
+		Critical, // deprecated
+		Emergency, // deprecated
+		Alert, // deprecated
+		Notice, // deprecated
 		AIScanClose,
 		AIYellForHelp,
 		AICastBeneficialClose,
@@ -160,52 +159,52 @@ namespace Logs {
 		"Inventory",
 		"Launcher",
 		"Netcode",
-		"Normal",
+		"Normal (Deprecated)",
 		"Object",
 		"Pathing",
-		"QS Server",
+		"QS Server (Deprecated)",
 		"Quests",
 		"Rules",
 		"Skills",
 		"Spawns",
 		"Spells",
-		"Status",
+		"Status (Deprecated)",
 		"TCP Connection",
 		"Tasks",
 		"Tradeskills",
 		"Trading",
 		"Tribute",
-		"UCS Server",
-		"WebInterface Server",
-		"World Server",
-		"Zone Server",
-		"MySQL Error",
-		"MySQL Query",
+		"UCS Server (Deprecated)",
+		"Web Interface (Deprecated)",
+		"World Server (Deprecated)",
+		"Zone Server (Deprecated)",
+		"QueryErr",
+		"Query",
 		"Mercenaries",
 		"Quest Debug",
-		"Deprecated",
-		"Deprecated",
-		"Deprecated",
-		"Deprecated",
-		"Login Server",
+		"Legacy Packet Logging (Deprecated)",
+		"Legacy Packet Logging (Deprecated)",
+		"Legacy Packet Logging (Deprecated)",
+		"Legacy Packet Logging (Deprecated)",
+		"Login Server (Deprecated)",
 		"Client Login",
-		"Headless Client",
+		"Headless Client (Deprecated)",
 		"HP Update",
 		"FixZ",
 		"Food",
 		"Traps",
 		"NPC Roam Box",
 		"NPC Scaling",
-		"Mob Appearance",
+		"MobAppearance",
 		"Info",
 		"Warning",
-		"Critical",
-		"Emergency",
-		"Alert",
-		"Notice",
-		"AI Scan Close",
-		"AI Yell For Help",
-		"AI Cast Beneficial Close",
+		"Critical (Deprecated)",
+		"Emergency (Deprecated)",
+		"Alert (Deprecated)",
+		"Notice (Deprecated)",
+		"AI Scan",
+		"AI Yell",
+		"AI CastBeneficial",
 		"AOE Cast",
 		"Entity Management",
 		"Flee",
@@ -222,14 +221,14 @@ namespace Logs {
 		"DialogueWindow",
 		"HTTP",
 		"Saylink",
-		"ChecksumVerification",
+		"ChecksumVer",
 		"CombatRecord",
 		"Hate",
 		"Discord",
 		"Faction",
-		"Packet-S->C",
-		"Packet-C->S",
-		"Packet-S->S",
+		"Packet S->C",
+		"Packet C->S",
+		"Packet S->S",
 		"Bugs",
 		"QuestErrors"
 	};
@@ -386,12 +385,14 @@ private:
 	std::string                                                                   m_platform_file_name;
 	std::string                                                                   m_log_path;
 
-	std::string GetLinuxConsoleColorFromCategory(uint16 log_category);
-	uint16 GetWindowsConsoleColorFromCategory(uint16 log_category);
-
-	void ProcessConsoleMessage(uint16 log_category, const std::string &message);
+	void ProcessConsoleMessage(
+		uint16 log_category,
+		const std::string &message,
+		const char *file,
+		const char *func,
+		int line
+	);
 	void ProcessLogWrite(uint16 log_category, const std::string &message);
-	bool IsRfc5424LogCategory(uint16 log_category);
 	void InjectTablesIfNotExist();
 };
 

common/eqemu_logsys_log_aliases.h

@@ -21,8 +21,6 @@
 #ifndef EQEMU_EQEMU_LOGSYS_LOG_ALIASES_H
 #define EQEMU_EQEMU_LOGSYS_LOG_ALIASES_H
 
-#ifdef BUILD_LOGGING
-
 #define LogAA(message, ...) do {\
     if (LogSys.IsLogEnabled(Logs::General, Logs::AA))\
         OutF(LogSys, Logs::General, Logs::AA, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
@@ -38,11 +36,6 @@
         OutF(LogSys, Logs::General, Logs::AI, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
 } while (0)
 
-#define LogAIModerate(message, ...) do {\
-    if (LogSys.IsLogEnabled(Logs::Moderate, Logs::AI))\
-        OutF(LogSys, Logs::Moderate, Logs::AI, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
-} while (0)
-
 #define LogAIDetail(message, ...) do {\
     if (LogSys.IsLogEnabled(Logs::Detail, Logs::AI))\
         OutF(LogSys, Logs::Detail, Logs::AI, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
@@ -83,11 +76,6 @@
         OutF(LogSys, Logs::General, Logs::Combat, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
 } while (0)
 
-#define LogCombatModerate(message, ...) do {\
-    if (LogSys.IsLogEnabled(Logs::Moderate, Logs::Combat))\
-        OutF(LogSys, Logs::Moderate, Logs::Combat, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
-} while (0)
-
 #define LogCombatDetail(message, ...) do {\
     if (LogSys.IsLogEnabled(Logs::Detail, Logs::Combat))\
         OutF(LogSys, Logs::Detail, Logs::Combat, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
@@ -213,16 +201,6 @@
         OutF(LogSys, Logs::Detail, Logs::Pathing, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
 } while (0)
 
-#define LogQSServer(message, ...) do {\
-    if (LogSys.IsLogEnabled(Logs::General, Logs::QSServer))\
-        OutF(LogSys, Logs::General, Logs::QSServer, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
-} while (0)
-
-#define LogQSServerDetail(message, ...) do {\
-    if (LogSys.IsLogEnabled(Logs::Detail, Logs::QSServer))\
-        OutF(LogSys, Logs::Detail, Logs::QSServer, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
-} while (0)
-
 #define LogQuests(message, ...) do {\
     if (LogSys.IsLogEnabled(Logs::General, Logs::Quests))\
         OutF(LogSys, Logs::General, Logs::Quests, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
@@ -268,11 +246,6 @@
         OutF(LogSys, Logs::General, Logs::Spells, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
 } while (0)
 
-#define LogSpellsModerate(message, ...) do {\
-    if (LogSys.IsLogEnabled(Logs::Moderate, Logs::Spells))\
-        OutF(LogSys, Logs::Moderate, Logs::Spells, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
-} while (0)
-
 #define LogSpellsDetail(message, ...) do {\
     if (LogSys.IsLogEnabled(Logs::Detail, Logs::Spells))\
         OutF(LogSys, Logs::Detail, Logs::Spells, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
@@ -338,46 +311,6 @@
         OutF(LogSys, Logs::Detail, Logs::Tribute, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
 } while (0)
 
-#define LogUCSServer(message, ...) do {\
-    if (LogSys.IsLogEnabled(Logs::General, Logs::UCSServer))\
-        OutF(LogSys, Logs::General, Logs::UCSServer, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
-} while (0)
-
-#define LogUCSServerDetail(message, ...) do {\
-    if (LogSys.IsLogEnabled(Logs::Detail, Logs::UCSServer))\
-        OutF(LogSys, Logs::Detail, Logs::UCSServer, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
-} while (0)
-
-#define LogWebInterfaceServer(message, ...) do {\
-    if (LogSys.IsLogEnabled(Logs::General, Logs::WebInterfaceServer))\
-        OutF(LogSys, Logs::General, Logs::WebInterfaceServer, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
-} while (0)
-
-#define LogWebInterfaceServerDetail(message, ...) do {\
-    if (LogSys.IsLogEnabled(Logs::Detail, Logs::WebInterfaceServer))\
-        OutF(LogSys, Logs::Detail, Logs::WebInterfaceServer, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
-} while (0)
-
-#define LogWorldServer(message, ...) do {\
-    if (LogSys.IsLogEnabled(Logs::General, Logs::WorldServer))\
-        OutF(LogSys, Logs::General, Logs::WorldServer, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
-} while (0)
-
-#define LogWorldServerDetail(message, ...) do {\
-    if (LogSys.IsLogEnabled(Logs::Detail, Logs::WorldServer))\
-        OutF(LogSys, Logs::Detail, Logs::WorldServer, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
-} while (0)
-
-#define LogZoneServer(message, ...) do {\
-    if (LogSys.IsLogEnabled(Logs::General, Logs::ZoneServer))\
-        OutF(LogSys, Logs::General, Logs::ZoneServer, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
-} while (0)
-
-#define LogZoneServerDetail(message, ...) do {\
-    if (LogSys.IsLogEnabled(Logs::Detail, Logs::ZoneServer))\
-        OutF(LogSys, Logs::Detail, Logs::ZoneServer, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
-} while (0)
-
 #define LogMySQLError(message, ...) do {\
     if (LogSys.IsLogEnabled(Logs::General, Logs::MySQLError))\
         OutF(LogSys, Logs::General, Logs::MySQLError, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
@@ -449,16 +382,6 @@
         OutF(LogSys, Logs::Detail, Logs::ClientLogin, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
 } while (0)
 
-#define LogHeadlessClient(message, ...) do {\
-    if (LogSys.IsLogEnabled(Logs::General, Logs::HeadlessClient))\
-        OutF(LogSys, Logs::General, Logs::HeadlessClient, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
-} while (0)
-
-#define LogHeadlessClientDetail(message, ...) do {\
-    if (LogSys.IsLogEnabled(Logs::Detail, Logs::HeadlessClient))\
-        OutF(LogSys, Logs::Detail, Logs::HeadlessClient, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
-} while (0)
-
 #define LogHPUpdate(message, ...) do {\
     if (LogSys.IsLogEnabled(Logs::General, Logs::HPUpdate))\
         OutF(LogSys, Logs::General, Logs::HPUpdate, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
@@ -594,11 +517,6 @@
         OutF(LogSys, Logs::General, Logs::AIScanClose, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
 } while (0)
 
-#define LogAIScanCloseModerate(message, ...) do {\
-    if (LogSys.IsLogEnabled(Logs::Moderate, Logs::AIScanClose))\
-        OutF(LogSys, Logs::Moderate, Logs::AIScanClose, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
-} while (0)
-
 #define LogAIScanCloseDetail(message, ...) do {\
     if (LogSys.IsLogEnabled(Logs::Detail, Logs::AIScanClose))\
         OutF(LogSys, Logs::Detail, Logs::AIScanClose, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
@@ -846,11 +764,6 @@
 
 // manually created
 
-#define LogExpeditionsModerate(message, ...) do {\
-    if (LogSys.IsLogEnabled(Logs::Moderate, Logs::Expeditions))\
-        OutF(LogSys, Logs::Moderate, Logs::Expeditions, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
-} while (0)
-
 #define LogBugs(message, ...) do {\
     if (LogSys.IsLogEnabled(Logs::General, Logs::Bugs))\
         OutF(LogSys, Logs::General, Logs::Bugs, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
@@ -881,469 +794,5 @@
         OutF(LogSys, debug_level, log_category, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
 } while (0)
 
-#else
-#define LogEmergency(message, ...) do {\
-} while (0)
-
-#define LogAlert(message, ...) do {\
-} while (0)
-
-#define LogCritical(message, ...) do {\
-} while (0)
-
-#define LogError(message, ...) do {\
-} while (0)
-
-#define LogWarning(message, ...) do {\
-} while (0)
-
-#define LogNotice(message, ...) do {\
-} while (0)
-
-#define LogInfo(message, ...) do {\
-} while (0)
-
-#define LogDebug(message, ...) do {\
-} while (0)
-
-/**
- * Category
- */
-
-#define LogAA(message, ...) do {\
-} while (0)
-
-#define LogAADetail(message, ...) do {\
-} while (0)
-
-#define LogAI(message, ...) do {\
-} while (0)
-
-#define LogAIModerate(message, ...) do {\
-} while (0)
-
-#define LogAIDetail(message, ...) do {\
-} while (0)
-
-#define LogAggro(message, ...) do {\
-} while (0)
-
-#define LogAggroDetail(message, ...) do {\
-} while (0)
-
-#define LogAttack(message, ...) do {\
-} while (0)
-
-#define LogAttackDetail(message, ...) do {\
-} while (0)
-
-#define LogPacketClientServer(message, ...) do {\
-} while (0)
-
-#define LogPacketClientServerDetail(message, ...) do {\
-} while (0)
-
-#define LogCombat(message, ...) do {\
-} while (0)
-
-#define LogCombatModerate(message, ...) do {\
-} while (0)
-
-#define LogCombatDetail(message, ...) do {\
-} while (0)
-
-#define LogCommands(message, ...) do {\
-} while (0)
-
-#define LogCommandsDetail(message, ...) do {\
-} while (0)
-
-#define LogCrash(message, ...) do {\
-} while (0)
-
-#define LogCrashDetail(message, ...) do {\
-} while (0)
-
-#define LogDoors(message, ...) do {\
-} while (0)
-
-#define LogDoorsDetail(message, ...) do {\
-} while (0)
-
-#define LogGroup(message, ...) do {\
-} while (0)
-
-#define LogGroupDetail(message, ...) do {\
-} while (0)
-
-#define LogGuilds(message, ...) do {\
-} while (0)
-
-#define LogGuildsDetail(message, ...) do {\
-} while (0)
-
-#define LogInventory(message, ...) do {\
-} while (0)
-
-#define LogInventoryDetail(message, ...) do {\
-} while (0)
-
-#define LogLauncher(message, ...) do {\
-} while (0)
-
-#define LogLauncherDetail(message, ...) do {\
-} while (0)
-
-#define LogNetcode(message, ...) do {\
-} while (0)
-
-#define LogNetcodeDetail(message, ...) do {\
-} while (0)
-
-#define LogNormal(message, ...) do {\
-} while (0)
-
-#define LogNormalDetail(message, ...) do {\
-} while (0)
-
-#define LogObject(message, ...) do {\
-} while (0)
-
-#define LogObjectDetail(message, ...) do {\
-} while (0)
-
-#define LogPathing(message, ...) do {\
-} while (0)
-
-#define LogPathingDetail(message, ...) do {\
-} while (0)
-
-#define LogQSServer(message, ...) do {\
-} while (0)
-
-#define LogQSServerDetail(message, ...) do {\
-} while (0)
-
-#define LogQuests(message, ...) do {\
-} while (0)
-
-#define LogQuestsDetail(message, ...) do {\
-} while (0)
-
-#define LogRules(message, ...) do {\
-} while (0)
-
-#define LogRulesDetail(message, ...) do {\
-} while (0)
-
-#define LogSkills(message, ...) do {\
-} while (0)
-
-#define LogSkillsDetail(message, ...) do {\
-} while (0)
-
-#define LogSpawns(message, ...) do {\
-} while (0)
-
-#define LogSpawnsDetail(message, ...) do {\
-} while (0)
-
-#define LogSpells(message, ...) do {\
-} while (0)
-
-#define LogSpellsModerate(message, ...) do {\
-} while (0)
-
-#define LogSpellsDetail(message, ...) do {\
-} while (0)
-
-#define LogTCPConnection(message, ...) do {\
-} while (0)
-
-#define LogTCPConnectionDetail(message, ...) do {\
-} while (0)
-
-#define LogTasks(message, ...) do {\
-} while (0)
-
-#define LogTasksDetail(message, ...) do {\
-} while (0)
-
-#define LogTradeskills(message, ...) do {\
-} while (0)
-
-#define LogTradeskillsDetail(message, ...) do {\
-} while (0)
-
-#define LogTrading(message, ...) do {\
-} while (0)
-
-#define LogTradingDetail(message, ...) do {\
-} while (0)
-
-#define LogTribute(message, ...) do {\
-} while (0)
-
-#define LogTributeDetail(message, ...) do {\
-} while (0)
-
-#define LogMySQLError(message, ...) do {\
-} while (0)
-
-#define LogMySQLErrorDetail(message, ...) do {\
-} while (0)
-
-#define LogMySQLQuery(message, ...) do {\
-} while (0)
-
-#define LogMySQLQueryDetail(message, ...) do {\
-} while (0)
-
-#define LogMercenaries(message, ...) do {\
-} while (0)
-
-#define LogMercenariesDetail(message, ...) do {\
-} while (0)
-
-#define LogQuestDebug(message, ...) do {\
-} while (0)
-
-#define LogQuestDebugDetail(message, ...) do {\
-} while (0)
-
-#define LogLoginserver(message, ...) do {\
-} while (0)
-
-#define LogLoginserverDetail(message, ...) do {\
-} while (0)
-
-#define LogClientLogin(message, ...) do {\
-} while (0)
-
-#define LogClientLoginDetail(message, ...) do {\
-} while (0)
-
-#define LogHeadlessClient(message, ...) do {\
-} while (0)
-
-#define LogHeadlessClientDetail(message, ...) do {\
-} while (0)
-
-#define LogHPUpdate(message, ...) do {\
-} while (0)
-
-#define LogHPUpdateDetail(message, ...) do {\
-} while (0)
-
-#define LogFixZ(message, ...) do {\
-} while (0)
-
-#define LogFixZDetail(message, ...) do {\
-} while (0)
-
-#define LogFood(message, ...) do {\
-} while (0)
-
-#define LogFoodDetail(message, ...) do {\
-} while (0)
-
-#define LogTraps(message, ...) do {\
-} while (0)
-
-#define LogTrapsDetail(message, ...) do {\
-} while (0)
-
-#define LogNPCRoamBox(message, ...) do {\
-} while (0)
-
-#define LogNPCRoamBoxDetail(message, ...) do {\
-} while (0)
-
-#define LogNPCScaling(message, ...) do {\
-} while (0)
-
-#define LogNPCScalingDetail(message, ...) do {\
-} while (0)
-
-#define LogMobAppearance(message, ...) do {\
-} while (0)
-
-#define LogMobAppearanceDetail(message, ...) do {\
-} while (0)
-
-#define LogStatus(message, ...) do {\
-} while (0)
-
-#define LogStatusDetail(message, ...) do {\
-} while (0)
-
-#define LogAIScanClose(message, ...) do {\
-} while (0)
-
-#define LogAIScanCloseModerate(message, ...) do {\
-} while (0)
-
-#define LogAIScanCloseDetail(message, ...) do {\
-} while (0)
-
-#define LogAIYellForHelp(message, ...) do {\
-} while (0)
-
-#define LogAIYellForHelpDetail(message, ...) do {\
-} while (0)
-
-#define LogAICastBeneficialClose(message, ...) do {\
-} while (0)
-
-#define LogAICastBeneficialCloseDetail(message, ...) do {\
-} while (0)
-
-#define LogAoeCast(message, ...) do {\
-} while (0)
-
-#define LogAoeCastDetail(message, ...) do {\
-} while (0)
-
-#define LogEntityManagement(message, ...) do {\
-} while (0)
-
-#define LogEntityManagementDetail(message, ...) do {\
-} while (0)
-
-#define LogFlee(message, ...) do {\
-} while (0)
-
-#define LogFleeDetail(message, ...) do {\
-} while (0)
-
-#define LogAura(message, ...) do {\
-} while (0)
-
-#define LogAuraDetail(message, ...) do {\
-} while (0)
-
-#define LogHotReload(message, ...) do {\
-} while (0)
-
-#define LogHotReloadDetail(message, ...) do {\
-} while (0)
-
-#define LogMerchants(message, ...) do {\
-} while (0)
-
-#define LogMerchantsDetail(message, ...) do {\
-} while (0)
-
-#define LogZonePoints(message, ...) do {\
-} while (0)
-
-#define LogZonePointsDetail(message, ...) do {\
-} while (0)
-
-#define LogExpeditions(message, ...) do {\
-} while (0)
-
-#define LogExpeditionsModerate(message, ...) do {\
-} while (0)
-
-#define LogExpeditionsDetail(message, ...) do {\
-} while (0)
-
-#define LogDynamicZones(message, ...) do {\
-} while (0)
-
-#define LogDynamicZonesDetail(message, ...) do {\
-} while (0)
-
-#define LogCheatList(message, ...) do {\
-} while (0)
-
-#define LogCheatDetail(message, ...) do {\
-} while (0)
-
-#define LogClientList(message, ...) do {\
-} while (0)
-
-#define LogClientListDetail(message, ...) do {\
-} while (0)
-
-#define LogDiaWind(message, ...) do {\
-} while (0)
-
-#define LogDiaWindDetail(message, ...) do {\
-} while (0)
-
-#define LogHTTP(message, ...) do {\
-} while (0)
-
-#define LogHTTPDetail(message, ...) do {\
-} while (0)
-
-#define LogSaylink(message, ...) do {\
-} while (0)
-
-#define LogSaylinkDetail(message, ...) do {\
-} while (0)
-
-#define LogScheduler(message, ...) do {\
-} while (0)
-
-#define LogSchedulerDetail(message, ...) do {\
-} while (0)
-
-#define LogCheat(message, ...) do {\
-} while (0)
-
-#define LogCheatDetail(message, ...) do {\
-} while (0)
-
-#define LogLoot(message, ...) do {\
-} while (0)
-
-#define LogLootDetail(message, ...) do {\
-} while (0)
-
-#define LogFood(message, ...) do {\
-} while (0)
-
-#define LogFoodDetail(message, ...) do {\
-} while (0)
-
-#define LogChecksumVerification(message, ...) do {\
-} while (0)
-
-#define LogChecksumVerificationDetail(message, ...) do {\
-} while (0)
-
-#define LogCombatRecord(message, ...) do {\
-} while (0)
-
-#define LogCombatRecordDetail(message, ...) do {\
-} while (0)
-
-#define LogHate(message, ...) do {\
-} while (0)
-
-#define LogHateDetail(message, ...) do {\
-} while (0)
-
-#define LogFaction(message, ...) do {\
-} while (0)
-
-#define LogFactionDetail(message, ...) do {\
-} while (0)
-
-#define LogBugs(message, ...) do {\
-} while (0)
-
-#define LogBugsDetail(message, ...) do {\
-} while (0)
-
-#define Log(debug_level, log_category, message, ...) do {\
-} while (0)
-
-#define LogF(debug_level, log_category, message, ...) do {\
-} while (0)
-#endif
 
 #endif //EQEMU_EQEMU_LOGSYS_LOG_ALIASES_H

common/guild_base.cpp

@@ -63,7 +63,9 @@ bool BaseGuildManager::LoadGuilds() {
 	for (auto row=results.begin();row!=results.end();++row)
 		_CreateGuild(atoi(row[0]), row[1], atoi(row[2]), atoi(row[3]), row[4], row[5], row[6], row[7]);
 
-    query = "SELECT guild_id,`rank`,title,can_hear,can_speak,can_invite,can_remove,can_promote,can_demote,can_motd,can_warpeace FROM guild_ranks";
+	LogInfo("Loaded [{}] Guilds", Strings::Commify(std::to_string(results.RowCount())));
+
+	query = "SELECT guild_id,`rank`,title,can_hear,can_speak,can_invite,can_remove,can_promote,can_demote,can_motd,can_warpeace FROM guild_ranks";
 	results = m_db->QueryDatabase(query);
 
 	if (!results.Success())

common/patches/rof.cpp

@@ -665,7 +665,7 @@ namespace RoF
 
 	ENCODE(OP_DeleteCharge)
 	{
-		Log(Logs::Moderate, Logs::Netcode, "RoF::ENCODE(OP_DeleteCharge)");
+		Log(Logs::Detail, Logs::Netcode, "RoF::ENCODE(OP_DeleteCharge)");
 
 		ENCODE_FORWARD(OP_MoveItem);
 	}
@@ -1593,7 +1593,7 @@ namespace RoF
 		ENCODE_LENGTH_EXACT(LootingItem_Struct);
 		SETUP_DIRECT_ENCODE(LootingItem_Struct, structs::LootingItem_Struct);
 
-		Log(Logs::Moderate, Logs::Netcode, "RoF::ENCODE(OP_LootItem)");
+		Log(Logs::Detail, Logs::Netcode, "RoF::ENCODE(OP_LootItem)");
 
 		OUT(lootee);
 		OUT(looter);
@@ -1751,7 +1751,7 @@ namespace RoF
 		ENCODE_LENGTH_EXACT(MoveItem_Struct);
 		SETUP_DIRECT_ENCODE(MoveItem_Struct, structs::MoveItem_Struct);
 
-		Log(Logs::Moderate, Logs::Netcode, "RoF::ENCODE(OP_MoveItem)");
+		Log(Logs::Detail, Logs::Netcode, "RoF::ENCODE(OP_MoveItem)");
 
 		eq->from_slot = ServerToRoFSlot(emu->from_slot);
 		eq->to_slot = ServerToRoFSlot(emu->to_slot);
@@ -3831,7 +3831,7 @@ namespace RoF
 			}
 
 			float SpawnSize = emu->size;
-			if (!((emu->NPC == 0) || (emu->race <= RACE_GNOME_12) || (emu->race == RACE_IKSAR_128) || 
+			if (!((emu->NPC == 0) || (emu->race <= RACE_GNOME_12) || (emu->race == RACE_IKSAR_128) ||
 					(emu->race == RACE_VAH_SHIR_130) || (emu->race == RACE_FROGLOK_330) || (emu->race == RACE_DRAKKIN_522))
 				)
 			{
@@ -3965,7 +3965,7 @@ namespace RoF
 			VARSTRUCT_ENCODE_TYPE(uint32, Buffer, 0xffffffff); // unknown18
 			VARSTRUCT_ENCODE_TYPE(uint32, Buffer, 0xffffffff); // unknown19
 
-			if ((emu->NPC == 0) || (emu->race <= RACE_GNOME_12) || (emu->race == RACE_IKSAR_128) || 
+			if ((emu->NPC == 0) || (emu->race <= RACE_GNOME_12) || (emu->race == RACE_IKSAR_128) ||
 					(emu->race == RACE_VAH_SHIR_130) || (emu->race == RACE_FROGLOK_330) || (emu->race == RACE_DRAKKIN_522)
 				)
 			{
@@ -4822,7 +4822,7 @@ namespace RoF
 		DECODE_LENGTH_EXACT(structs::LootingItem_Struct);
 		SETUP_DIRECT_DECODE(LootingItem_Struct, structs::LootingItem_Struct);
 
-		Log(Logs::Moderate, Logs::Netcode, "RoF::DECODE(OP_LootItem)");
+		Log(Logs::Detail, Logs::Netcode, "RoF::DECODE(OP_LootItem)");
 
 		IN(lootee);
 		IN(looter);
@@ -4837,7 +4837,7 @@ namespace RoF
 		DECODE_LENGTH_EXACT(structs::MoveItem_Struct);
 		SETUP_DIRECT_DECODE(MoveItem_Struct, structs::MoveItem_Struct);
 
-		Log(Logs::Moderate, Logs::Netcode, "RoF::DECODE(OP_MoveItem)");
+		Log(Logs::Detail, Logs::Netcode, "RoF::DECODE(OP_MoveItem)");
 
 		emu->from_slot = RoFToServerSlot(eq->from_slot);
 		emu->to_slot = RoFToServerSlot(eq->to_slot);

common/patches/rof2.cpp

@@ -716,7 +716,7 @@ namespace RoF2
 
 	ENCODE(OP_DeleteCharge)
 	{
-		Log(Logs::Moderate, Logs::Netcode, "RoF2::ENCODE(OP_DeleteCharge)");
+		Log(Logs::Detail, Logs::Netcode, "RoF2::ENCODE(OP_DeleteCharge)");
 
 		ENCODE_FORWARD(OP_MoveItem);
 	}
@@ -1644,7 +1644,7 @@ namespace RoF2
 		ENCODE_LENGTH_EXACT(LootingItem_Struct);
 		SETUP_DIRECT_ENCODE(LootingItem_Struct, structs::LootingItem_Struct);
 
-		Log(Logs::Moderate, Logs::Netcode, "RoF2::ENCODE(OP_LootItem)");
+		Log(Logs::Detail, Logs::Netcode, "RoF2::ENCODE(OP_LootItem)");
 
 		OUT(lootee);
 		OUT(looter);
@@ -1802,7 +1802,7 @@ namespace RoF2
 		ENCODE_LENGTH_EXACT(MoveItem_Struct);
 		SETUP_DIRECT_ENCODE(MoveItem_Struct, structs::MoveItem_Struct);
 
-		Log(Logs::Moderate, Logs::Netcode, "RoF2::ENCODE(OP_MoveItem)");
+		Log(Logs::Detail, Logs::Netcode, "RoF2::ENCODE(OP_MoveItem)");
 
 		eq->from_slot = ServerToRoF2Slot(emu->from_slot);
 		eq->to_slot = ServerToRoF2Slot(emu->to_slot);
@@ -3967,7 +3967,7 @@ namespace RoF2
 			}
 
 			float SpawnSize = emu->size;
-			if (!((emu->NPC == 0) || (emu->race <= RACE_GNOME_12) || (emu->race == RACE_IKSAR_128) || 
+			if (!((emu->NPC == 0) || (emu->race <= RACE_GNOME_12) || (emu->race == RACE_IKSAR_128) ||
 					(emu->race == RACE_VAH_SHIR_130) || (emu->race == RACE_FROGLOK_330) || (emu->race == RACE_DRAKKIN_522))
 				)
 			{
@@ -4172,7 +4172,7 @@ namespace RoF2
 			VARSTRUCT_ENCODE_TYPE(uint32, Buffer, 0xffffffff); // These do something with OP_WeaponEquip1
 			VARSTRUCT_ENCODE_TYPE(uint32, Buffer, 0xffffffff); // ^
 
-			if ((emu->NPC == 0) || (emu->race <= RACE_GNOME_12) || (emu->race == RACE_IKSAR_128) || 
+			if ((emu->NPC == 0) || (emu->race <= RACE_GNOME_12) || (emu->race == RACE_IKSAR_128) ||
 					(emu->race == RACE_VAH_SHIR_130) || (emu->race == RACE_FROGLOK_330) || (emu->race == RACE_DRAKKIN_522)
 				)
 			{
@@ -5023,7 +5023,7 @@ namespace RoF2
 		DECODE_LENGTH_EXACT(structs::LootingItem_Struct);
 		SETUP_DIRECT_DECODE(LootingItem_Struct, structs::LootingItem_Struct);
 
-		Log(Logs::Moderate, Logs::Netcode, "RoF2::DECODE(OP_LootItem)");
+		Log(Logs::Detail, Logs::Netcode, "RoF2::DECODE(OP_LootItem)");
 
 		IN(lootee);
 		IN(looter);
@@ -5038,7 +5038,7 @@ namespace RoF2
 		DECODE_LENGTH_EXACT(structs::MoveItem_Struct);
 		SETUP_DIRECT_DECODE(MoveItem_Struct, structs::MoveItem_Struct);
 
-		Log(Logs::Moderate, Logs::Netcode, "RoF2::DECODE(OP_MoveItem)");
+		Log(Logs::Detail, Logs::Netcode, "RoF2::DECODE(OP_MoveItem)");
 
 		emu->from_slot = RoF2ToServerSlot(eq->from_slot);
 		emu->to_slot = RoF2ToServerSlot(eq->to_slot);

common/patches/sod.cpp

@@ -458,7 +458,7 @@ namespace SoD
 
 	ENCODE(OP_DeleteCharge)
 	{
-		Log(Logs::Moderate, Logs::Netcode, "SoD::ENCODE(OP_DeleteCharge)");
+		Log(Logs::Detail, Logs::Netcode, "SoD::ENCODE(OP_DeleteCharge)");
 
 		ENCODE_FORWARD(OP_MoveItem);
 	}
@@ -1128,7 +1128,7 @@ namespace SoD
 		ENCODE_LENGTH_EXACT(LootingItem_Struct);
 		SETUP_DIRECT_ENCODE(LootingItem_Struct, structs::LootingItem_Struct);
 
-		Log(Logs::Moderate, Logs::Netcode, "SoD::ENCODE(OP_LootItem)");
+		Log(Logs::Detail, Logs::Netcode, "SoD::ENCODE(OP_LootItem)");
 
 		OUT(lootee);
 		OUT(looter);
@@ -1277,7 +1277,7 @@ namespace SoD
 		ENCODE_LENGTH_EXACT(MoveItem_Struct);
 		SETUP_DIRECT_ENCODE(MoveItem_Struct, structs::MoveItem_Struct);
 
-		Log(Logs::Moderate, Logs::Netcode, "SoD::ENCODE(OP_MoveItem)");
+		Log(Logs::Detail, Logs::Netcode, "SoD::ENCODE(OP_MoveItem)");
 
 		eq->from_slot = ServerToSoDSlot(emu->from_slot);
 		eq->to_slot = ServerToSoDSlot(emu->to_slot);
@@ -2467,7 +2467,7 @@ namespace SoD
 			}
 
 			float SpawnSize = emu->size;
-			if (!((emu->NPC == 0) || (emu->race <= RACE_GNOME_12) || (emu->race == RACE_IKSAR_128) || 
+			if (!((emu->NPC == 0) || (emu->race <= RACE_GNOME_12) || (emu->race == RACE_IKSAR_128) ||
 					(emu->race == RACE_VAH_SHIR_130) || (emu->race == RACE_FROGLOK_330) || (emu->race == RACE_DRAKKIN_522))
 				)
 			{
@@ -2666,7 +2666,7 @@ namespace SoD
 
 			Buffer += sizeof(structs::Spawn_Struct_Position);
 
-			if ((emu->NPC == 0) || (emu->race <= RACE_GNOME_12) || (emu->race == RACE_IKSAR_128) || 
+			if ((emu->NPC == 0) || (emu->race <= RACE_GNOME_12) || (emu->race == RACE_IKSAR_128) ||
 					(emu->race == RACE_VAH_SHIR_130) || (emu->race == RACE_FROGLOK_330) || (emu->race == RACE_DRAKKIN_522)
 				)
 			{
@@ -2693,7 +2693,7 @@ namespace SoD
 			}
 
 
-			if ((emu->NPC == 0) || (emu->race <= RACE_GNOME_12) || (emu->race == RACE_IKSAR_128) || 
+			if ((emu->NPC == 0) || (emu->race <= RACE_GNOME_12) || (emu->race == RACE_IKSAR_128) ||
 					(emu->race == RACE_VAH_SHIR_130) || (emu->race == RACE_FROGLOK_330) || (emu->race == RACE_DRAKKIN_522)
 				)
 			{
@@ -3226,7 +3226,7 @@ namespace SoD
 		DECODE_LENGTH_EXACT(structs::LootingItem_Struct);
 		SETUP_DIRECT_DECODE(LootingItem_Struct, structs::LootingItem_Struct);
 
-		Log(Logs::Moderate, Logs::Netcode, "SoD::DECODE(OP_LootItem)");
+		Log(Logs::Detail, Logs::Netcode, "SoD::DECODE(OP_LootItem)");
 
 		IN(lootee);
 		IN(looter);
@@ -3241,7 +3241,7 @@ namespace SoD
 		DECODE_LENGTH_EXACT(structs::MoveItem_Struct);
 		SETUP_DIRECT_DECODE(MoveItem_Struct, structs::MoveItem_Struct);
 
-		Log(Logs::Moderate, Logs::Netcode, "SoD::DECODE(OP_MoveItem)");
+		Log(Logs::Detail, Logs::Netcode, "SoD::DECODE(OP_MoveItem)");
 
 		emu->from_slot = SoDToServerSlot(eq->from_slot);
 		emu->to_slot = SoDToServerSlot(eq->to_slot);

common/patches/sof.cpp

@@ -436,7 +436,7 @@ namespace SoF
 
 	ENCODE(OP_DeleteCharge)
 	{
-		Log(Logs::Moderate, Logs::Netcode, "SoF::ENCODE(OP_DeleteCharge)");
+		Log(Logs::Detail, Logs::Netcode, "SoF::ENCODE(OP_DeleteCharge)");
 
 		ENCODE_FORWARD(OP_MoveItem);
 	}
@@ -923,7 +923,7 @@ namespace SoF
 		ENCODE_LENGTH_EXACT(LootingItem_Struct);
 		SETUP_DIRECT_ENCODE(LootingItem_Struct, structs::LootingItem_Struct);
 
-		Log(Logs::Moderate, Logs::Netcode, "SoF::ENCODE(OP_LootItem)");
+		Log(Logs::Detail, Logs::Netcode, "SoF::ENCODE(OP_LootItem)");
 
 		OUT(lootee);
 		OUT(looter);
@@ -954,7 +954,7 @@ namespace SoF
 		ENCODE_LENGTH_EXACT(MoveItem_Struct);
 		SETUP_DIRECT_ENCODE(MoveItem_Struct, structs::MoveItem_Struct);
 
-		Log(Logs::Moderate, Logs::Netcode, "SoF::ENCODE(OP_MoveItem)");
+		Log(Logs::Detail, Logs::Netcode, "SoF::ENCODE(OP_MoveItem)");
 
 		eq->from_slot = ServerToSoFSlot(emu->from_slot);
 		eq->to_slot = ServerToSoFSlot(emu->to_slot);
@@ -2631,7 +2631,7 @@ namespace SoF
 		DECODE_LENGTH_EXACT(structs::LootingItem_Struct);
 		SETUP_DIRECT_DECODE(LootingItem_Struct, structs::LootingItem_Struct);
 
-		Log(Logs::Moderate, Logs::Netcode, "SoF::DECODE(OP_LootItem)");
+		Log(Logs::Detail, Logs::Netcode, "SoF::DECODE(OP_LootItem)");
 
 		IN(lootee);
 		IN(looter);
@@ -2646,7 +2646,7 @@ namespace SoF
 		DECODE_LENGTH_EXACT(structs::MoveItem_Struct);
 		SETUP_DIRECT_DECODE(MoveItem_Struct, structs::MoveItem_Struct);
 
-		Log(Logs::Moderate, Logs::Netcode, "SoF::DECODE(OP_MoveItem)");
+		Log(Logs::Detail, Logs::Netcode, "SoF::DECODE(OP_MoveItem)");
 
 		emu->from_slot = SoFToServerSlot(eq->from_slot);
 		emu->to_slot = SoFToServerSlot(eq->to_slot);

common/patches/titanium.cpp

@@ -380,7 +380,7 @@ namespace Titanium
 
 	ENCODE(OP_DeleteCharge)
 	{
-		Log(Logs::Moderate, Logs::Netcode, "Titanium::ENCODE(OP_DeleteCharge)");
+		Log(Logs::Detail, Logs::Netcode, "Titanium::ENCODE(OP_DeleteCharge)");
 
 		ENCODE_FORWARD(OP_MoveItem);
 	}
@@ -890,7 +890,7 @@ namespace Titanium
 		ENCODE_LENGTH_EXACT(LootingItem_Struct);
 		SETUP_DIRECT_ENCODE(LootingItem_Struct, structs::LootingItem_Struct);
 
-		Log(Logs::Moderate, Logs::Netcode, "Titanium::ENCODE(OP_LootItem)");
+		Log(Logs::Detail, Logs::Netcode, "Titanium::ENCODE(OP_LootItem)");
 
 		OUT(lootee);
 		OUT(looter);
@@ -934,7 +934,7 @@ namespace Titanium
 		ENCODE_LENGTH_EXACT(MoveItem_Struct);
 		SETUP_DIRECT_ENCODE(MoveItem_Struct, structs::MoveItem_Struct);
 
-		Log(Logs::Moderate, Logs::Netcode, "Titanium::ENCODE(OP_MoveItem)");
+		Log(Logs::Detail, Logs::Netcode, "Titanium::ENCODE(OP_MoveItem)");
 
 		eq->from_slot = ServerToTitaniumSlot(emu->from_slot);
 		eq->to_slot = ServerToTitaniumSlot(emu->to_slot);
@@ -2178,7 +2178,7 @@ namespace Titanium
 		DECODE_LENGTH_EXACT(structs::LootingItem_Struct);
 		SETUP_DIRECT_DECODE(LootingItem_Struct, structs::LootingItem_Struct);
 
-		Log(Logs::Moderate, Logs::Netcode, "Titanium::DECODE(OP_LootItem)");
+		Log(Logs::Detail, Logs::Netcode, "Titanium::DECODE(OP_LootItem)");
 
 		IN(lootee);
 		IN(looter);
@@ -2193,7 +2193,7 @@ namespace Titanium
 		DECODE_LENGTH_EXACT(structs::MoveItem_Struct);
 		SETUP_DIRECT_DECODE(MoveItem_Struct, structs::MoveItem_Struct);
 
-		Log(Logs::Moderate, Logs::Netcode, "Titanium::DECODE(OP_MoveItem)");
+		Log(Logs::Detail, Logs::Netcode, "Titanium::DECODE(OP_MoveItem)");
 
 		emu->from_slot = TitaniumToServerSlot(eq->from_slot);
 		emu->to_slot = TitaniumToServerSlot(eq->to_slot);

common/patches/uf.cpp

@@ -579,7 +579,7 @@ namespace UF
 
 	ENCODE(OP_DeleteCharge)
 	{
-		Log(Logs::Moderate, Logs::Netcode, "UF::ENCODE(OP_DeleteCharge)");
+		Log(Logs::Detail, Logs::Netcode, "UF::ENCODE(OP_DeleteCharge)");
 
 		ENCODE_FORWARD(OP_MoveItem);
 	}
@@ -1349,7 +1349,7 @@ namespace UF
 		ENCODE_LENGTH_EXACT(LootingItem_Struct);
 		SETUP_DIRECT_ENCODE(LootingItem_Struct, structs::LootingItem_Struct);
 
-		Log(Logs::Moderate, Logs::Netcode, "UF::ENCODE(OP_LootItem)");
+		Log(Logs::Detail, Logs::Netcode, "UF::ENCODE(OP_LootItem)");
 
 		OUT(lootee);
 		OUT(looter);
@@ -1502,7 +1502,7 @@ namespace UF
 		ENCODE_LENGTH_EXACT(MoveItem_Struct);
 		SETUP_DIRECT_ENCODE(MoveItem_Struct, structs::MoveItem_Struct);
 
-		Log(Logs::Moderate, Logs::Netcode, "UF::ENCODE(OP_MoveItem)");
+		Log(Logs::Detail, Logs::Netcode, "UF::ENCODE(OP_MoveItem)");
 
 		eq->from_slot = ServerToUFSlot(emu->from_slot);
 		eq->to_slot = ServerToUFSlot(emu->to_slot);
@@ -2739,7 +2739,7 @@ namespace UF
 			}
 
 			float SpawnSize = emu->size;
-			if (!((emu->NPC == 0) || (emu->race <= RACE_GNOME_12) || (emu->race == RACE_IKSAR_128) || 
+			if (!((emu->NPC == 0) || (emu->race <= RACE_GNOME_12) || (emu->race == RACE_IKSAR_128) ||
 					(emu->race == RACE_VAH_SHIR_130) || (emu->race == RACE_FROGLOK_330) || (emu->race == RACE_DRAKKIN_522))
 				)
 			{
@@ -2942,7 +2942,7 @@ namespace UF
 
 			Buffer += sizeof(structs::Spawn_Struct_Position);
 
-			if ((emu->NPC == 0) || (emu->race <= RACE_GNOME_12) || (emu->race == RACE_IKSAR_128) || 
+			if ((emu->NPC == 0) || (emu->race <= RACE_GNOME_12) || (emu->race == RACE_IKSAR_128) ||
 					(emu->race == RACE_VAH_SHIR_130) || (emu->race == RACE_FROGLOK_330) || (emu->race == RACE_DRAKKIN_522)
 				)
 			{
@@ -2978,7 +2978,7 @@ namespace UF
 				VARSTRUCT_ENCODE_TYPE(uint32, Buffer, 0);
 			}
 
-			if ((emu->NPC == 0) || (emu->race <= RACE_GNOME_12) || (emu->race == RACE_IKSAR_128) || 
+			if ((emu->NPC == 0) || (emu->race <= RACE_GNOME_12) || (emu->race == RACE_IKSAR_128) ||
 					(emu->race == RACE_VAH_SHIR_130) || (emu->race == RACE_FROGLOK_330) || (emu->race == RACE_DRAKKIN_522)
 				)
 			{
@@ -3584,7 +3584,7 @@ namespace UF
 		DECODE_LENGTH_EXACT(structs::LootingItem_Struct);
 		SETUP_DIRECT_DECODE(LootingItem_Struct, structs::LootingItem_Struct);
 
-		Log(Logs::Moderate, Logs::Netcode, "UF::DECODE(OP_LootItem)");
+		Log(Logs::Detail, Logs::Netcode, "UF::DECODE(OP_LootItem)");
 
 		IN(lootee);
 		IN(looter);
@@ -3599,7 +3599,7 @@ namespace UF
 		DECODE_LENGTH_EXACT(structs::MoveItem_Struct);
 		SETUP_DIRECT_DECODE(MoveItem_Struct, structs::MoveItem_Struct);
 
-		Log(Logs::Moderate, Logs::Netcode, "UF::DECODE(OP_MoveItem)");
+		Log(Logs::Detail, Logs::Netcode, "UF::DECODE(OP_MoveItem)");
 
 		emu->from_slot = UFToServerSlot(eq->from_slot);
 		emu->to_slot = UFToServerSlot(eq->to_slot);

common/path_manager.cpp

@@ -22,10 +22,10 @@ void PathManager::LoadPaths()
 
 	std::filesystem::current_path(m_server_path);
 
-	LogInfo("[PathManager] server [{}]", m_server_path);
+	LogInfo("server [{}]", m_server_path);
 
 	if (!EQEmuConfig::LoadConfig()) {
-		LogError("[PathManager] Failed to load eqemu config");
+		LogError("Failed to load eqemu config");
 		return;
 	}
 
@@ -77,14 +77,14 @@ void PathManager::LoadPaths()
 		m_log_path = fs::relative(fs::path{m_server_path + "/" + c->LogDir}).string();
 	}
 
-	LogInfo("[PathManager] logs [{}]", m_log_path);
-	LogInfo("[PathManager] lua mods [{}]", m_lua_mods_path);
-	LogInfo("[PathManager] lua_modules [{}]", m_lua_modules_path);
-	LogInfo("[PathManager] maps [{}]", m_maps_path);
-	LogInfo("[PathManager] patches [{}]", m_patch_path);
-	LogInfo("[PathManager] plugins [{}]", m_plugins_path);
-	LogInfo("[PathManager] quests [{}]", m_quests_path);
-	LogInfo("[PathManager] shared_memory [{}]", m_shared_memory_path);
+	LogInfo("logs path [{}]", m_log_path);
+	LogInfo("lua mods path [{}]", m_lua_mods_path);
+	LogInfo("lua_modules path [{}]", m_lua_modules_path);
+	LogInfo("maps path [{}]", m_maps_path);
+	LogInfo("patches path [{}]", m_patch_path);
+	LogInfo("plugins path [{}]", m_plugins_path);
+	LogInfo("quests path [{}]", m_quests_path);
+	LogInfo("shared_memory path [{}]", m_shared_memory_path);
 }
 
 const std::string &PathManager::GetServerPath() const

common/platform.cpp

@@ -55,14 +55,12 @@ std::string GetPlatformName()
 			return "UCS";
 		case EQEmuExePlatform::ExePlatformLogin:
 			return "Login";
-		case EQEmuExePlatform::ExePlatformSocket_Server:
-			return "SocketServer";
 		case EQEmuExePlatform::ExePlatformSharedMemory:
-			return "SharedMemory";
+			return "SharedMem";
 		case EQEmuExePlatform::ExePlatformClientImport:
-			return "ClientImport";
+			return "Import";
 		case EQEmuExePlatform::ExePlatformClientExport:
-			return "ClientExport";
+			return "Export";
 		case EQEmuExePlatform::ExePlatformLaunch:
 			return "Launch";
 		case EQEmuExePlatform::ExePlatformHC:

common/profanity_manager.cpp

@@ -18,6 +18,7 @@
 */
 
 #include "profanity_manager.h"
+#include "eqemu_logsys.h"
 #include "dbcore.h"
 #include "strings.h"
 
@@ -235,6 +236,8 @@ bool EQ::ProfanityManager::load_database_entries(DBcore *db) {
 		}
 	}
 
+	LogInfo("Loaded [{}] profanity entries", Strings::Commify(profanity_list.size()));
+
 	return true;
 }
 

common/rulesys.cpp

@@ -304,6 +304,13 @@ bool RuleManager::LoadRules(Database *db, const std::string &rule_set_name, bool
 		}
 	}
 
+	LogInfo(
+		"Loaded [{}] rules(s) in rule_set [{}] id [{}]",
+		Strings::Commify(std::to_string(l.size())),
+		rule_set_name,
+		rule_set_id
+	);
+
 	return true;
 }
 

common/shareddb.cpp

@@ -42,6 +42,7 @@
 #include "repositories/account_repository.h"
 #include "repositories/faction_association_repository.h"
 #include "path_manager.h"
+#include "repositories/loottable_repository.h"
 
 namespace ItemField
 {
@@ -942,10 +943,11 @@ bool SharedDatabase::LoadItems(const std::string &prefix) {
 		EQ::IPCMutex mutex("items");
 		mutex.Lock();
 		std::string file_name = fmt::format("{}/{}{}", path.GetSharedMemoryPath(), prefix, std::string("items"));
-		LogInfo("[Shared Memory] Attempting to load file [{}]", file_name);
 		items_mmf = std::make_unique<EQ::MemoryMappedFile>(file_name);
 		items_hash = std::make_unique<EQ::FixedMemoryHashSet<EQ::ItemData>>(static_cast<uint8*>(items_mmf->Get()), items_mmf->Size());
 		mutex.Unlock();
+
+		LogInfo("Loaded [{}] items via shared memory", Strings::Commify(m_shared_items_count));
 	} catch(std::exception& ex) {
 		LogError("Error Loading Items: {}", ex.what());
 		return false;
@@ -1438,10 +1440,12 @@ bool SharedDatabase::LoadNPCFactionLists(const std::string &prefix) {
 		EQ::IPCMutex mutex("faction");
 		mutex.Lock();
 		std::string file_name = fmt::format("{}/{}{}", path.GetSharedMemoryPath(), prefix, std::string("faction"));
-		LogInfo("[Shared Memory] Attempting to load file [{}]", file_name);
+		LogInfo("Loading [{}]", file_name);
 		faction_mmf = std::make_unique<EQ::MemoryMappedFile>(file_name);
 		faction_hash = std::make_unique<EQ::FixedMemoryHashSet<NPCFactionList>>(static_cast<uint8*>(faction_mmf->Get()), faction_mmf->Size());
 		mutex.Unlock();
+
+		LogInfo("Loaded faction lists via shared memory");
 	} catch(std::exception& ex) {
 		LogError("Error Loading npc factions: {}", ex.what());
 		return false;
@@ -1516,6 +1520,8 @@ bool SharedDatabase::LoadFactionAssociation(const std::string &prefix)
 		    new EQ::FixedMemoryHashSet<FactionAssociations>(reinterpret_cast<uint8 *>(faction_associations_mmf->Get()),
 								  faction_associations_mmf->Size()));
 		mutex.Unlock();
+
+		LogInfo("Loaded faction associations via shared memory");
 	} catch (std::exception &ex) {
 		LogError("Error Loading faction associations: {}", ex.what());
 		return false;
@@ -1724,8 +1730,11 @@ bool SharedDatabase::LoadSkillCaps(const std::string &prefix) {
 		EQ::IPCMutex mutex("skill_caps");
 		mutex.Lock();
 		std::string file_name = fmt::format("{}/{}{}", path.GetSharedMemoryPath(), prefix, std::string("skill_caps"));
-		LogInfo("[Shared Memory] Attempting to load file [{}]", file_name);
+		LogInfo("Loading [{}]", file_name);
 		skill_caps_mmf = std::make_unique<EQ::MemoryMappedFile>(file_name);
+
+		LogInfo("Loaded skill caps via shared memory");
+
 		mutex.Unlock();
 	} catch(std::exception &ex) {
 		LogError("Error loading skill caps: {}", ex.what());
@@ -1884,10 +1893,12 @@ bool SharedDatabase::LoadSpells(const std::string &prefix, int32 *records, const
 
 		std::string file_name = fmt::format("{}/{}{}", path.GetSharedMemoryPath(), prefix, std::string("spells"));
 		spells_mmf = std::make_unique<EQ::MemoryMappedFile>(file_name);
-		LogInfo("[Shared Memory] Attempting to load file [{}]", file_name);
+		LogInfo("Loading [{}]", file_name);
 		*records = *static_cast<uint32*>(spells_mmf->Get());
 		*sp = reinterpret_cast<const SPDat_Spell_Struct*>(static_cast<char*>(spells_mmf->Get()) + 4);
 		mutex.Unlock();
+
+		LogInfo("Loaded [{}] spells via shared memory", Strings::Commify(m_shared_spells_count));
 	}
 	catch(std::exception& ex) {
 		LogError("Error Loading Spells: {}", ex.what());
@@ -2099,6 +2110,8 @@ bool SharedDatabase::LoadBaseData(const std::string &prefix) {
 		std::string file_name = fmt::format("{}/{}{}", path.GetSharedMemoryPath(), prefix, std::string("base_data"));
 		base_data_mmf = std::make_unique<EQ::MemoryMappedFile>(file_name);
 		mutex.Unlock();
+
+		LogInfo("Loaded base data via shared memory");
 	} catch(std::exception& ex) {
 		LogError("Error Loading Base Data: {}", ex.what());
 		return false;
@@ -2423,6 +2436,9 @@ bool SharedDatabase::LoadLoot(const std::string &prefix) {
 		loot_table_hash = std::make_unique<EQ::FixedMemoryVariableHashSet<LootTable_Struct>>(
 			static_cast<uint8*>(loot_table_mmf->Get()),
 			loot_table_mmf->Size());
+
+		LogInfo("Loaded loot tables via shared memory");
+
 		std::string file_name_ld = fmt::format("{}/{}{}", path.GetSharedMemoryPath(), prefix, std::string("loot_drop"));
 		loot_drop_mmf = std::make_unique<EQ::MemoryMappedFile>(file_name_ld);
 		loot_drop_hash = std::make_unique<EQ::FixedMemoryVariableHashSet<LootDrop_Struct>>(

common/strings.h

@@ -95,6 +95,12 @@ public:
 	static std::string &RTrim(std::string &str, const std::string &chars = "\t\n\v\f\r ");
 	static std::string &Trim(std::string &str, const std::string &chars = "\t\n\v\f\r ");
 	static std::string Commify(const std::string &number);
+	static std::string Commify(uint16 number) { return Strings::Commify(std::to_string(number)); };
+	static std::string Commify(uint32 number) { return Strings::Commify(std::to_string(number)); };
+	static std::string Commify(uint64 number) { return Strings::Commify(std::to_string(number)); };
+	static std::string Commify(int16 number) { return Strings::Commify(std::to_string(number)); };
+	static std::string Commify(int32 number) { return Strings::Commify(std::to_string(number)); };
+	static std::string Commify(int64 number) { return Strings::Commify(std::to_string(number)); };
 	static std::string ConvertToDigit(int n, std::string suffix);
 	static std::string Escape(const std::string &s);
 	static std::string GetBetween(const std::string &s, std::string start_delim, std::string stop_delim);

common/termcolor/rang.hpp

@@ -0,0 +1,502 @@
+#ifndef RANG_DOT_HPP
+#define RANG_DOT_HPP
+
+#if defined(__unix__) || defined(__unix) || defined(__linux__)
+#define OS_LINUX
+#elif defined(WIN32) || defined(_WIN32) || defined(_WIN64)
+#define OS_WIN
+#elif defined(__APPLE__) || defined(__MACH__)
+#define OS_MAC
+#else
+#error Unknown Platform
+#endif
+
+#if defined(OS_LINUX) || defined(OS_MAC)
+#include <unistd.h>
+
+#elif defined(OS_WIN)
+
+#if defined(_WIN32_WINNT) && (_WIN32_WINNT < 0x0600)
+#error                                                                         \
+  "Please include rang.hpp before any windows system headers or set _WIN32_WINNT at least to _WIN32_WINNT_VISTA"
+#elif !defined(_WIN32_WINNT)
+#define _WIN32_WINNT _WIN32_WINNT_VISTA
+#endif
+
+#include <windows.h>
+#include <io.h>
+#include <memory>
+
+// Only defined in windows 10 onwards, redefining in lower windows since it
+// doesn't gets used in lower versions
+// https://docs.microsoft.com/en-us/windows/console/getconsolemode
+#ifndef ENABLE_VIRTUAL_TERMINAL_PROCESSING
+#define ENABLE_VIRTUAL_TERMINAL_PROCESSING 0x0004
+#endif
+
+#endif
+
+#include <algorithm>
+#include <atomic>
+#include <cstdlib>
+#include <cstring>
+#include <iostream>
+
+namespace rang {
+
+/* For better compability with most of terminals do not use any style settings
+ * except of reset, bold and reversed.
+ * Note that on Windows terminals bold style is same as fgB color.
+ */
+	enum class style {
+		reset     = 0,
+		bold      = 1,
+		dim       = 2,
+		italic    = 3,
+		underline = 4,
+		blink     = 5,
+		rblink    = 6,
+		reversed  = 7,
+		conceal   = 8,
+		crossed   = 9
+	};
+
+	enum class fg {
+		black   = 30,
+		red     = 31,
+		green   = 32,
+		yellow  = 33,
+		blue    = 34,
+		magenta = 35,
+		cyan    = 36,
+		gray    = 37,
+		reset   = 39
+	};
+
+	enum class bg {
+		black   = 40,
+		red     = 41,
+		green   = 42,
+		yellow  = 43,
+		blue    = 44,
+		magenta = 45,
+		cyan    = 46,
+		gray    = 47,
+		reset   = 49
+	};
+
+	enum class fgB {
+		black   = 90,
+		red     = 91,
+		green   = 92,
+		yellow  = 93,
+		blue    = 94,
+		magenta = 95,
+		cyan    = 96,
+		gray    = 97
+	};
+
+	enum class bgB {
+		black   = 100,
+		red     = 101,
+		green   = 102,
+		yellow  = 103,
+		blue    = 104,
+		magenta = 105,
+		cyan    = 106,
+		gray    = 107
+	};
+
+	enum class control {  // Behaviour of rang function calls
+		Off   = 0,  // toggle off rang style/color calls
+		Auto  = 1,  // (Default) autodect terminal and colorize if needed
+		Force = 2  // force ansi color output to non terminal streams
+	};
+// Use rang::setControlMode to set rang control mode
+
+	enum class winTerm {  // Windows Terminal Mode
+		Auto   = 0,  // (Default) automatically detects wheter Ansi or Native API
+		Ansi   = 1,  // Force use Ansi API
+		Native = 2  // Force use Native API
+	};
+// Use rang::setWinTermMode to explicitly set terminal API for Windows
+// Calling rang::setWinTermMode have no effect on other OS
+
+	namespace rang_implementation {
+
+		inline std::atomic<control> &controlMode() noexcept
+	{
+		static std::atomic<control> value(control::Auto);
+		return value;
+	}
+
+	inline std::atomic<winTerm> &winTermMode() noexcept
+{
+	static std::atomic<winTerm> termMode(winTerm::Auto);
+	return termMode;
+}
+
+inline bool supportsColor() noexcept
+{
+#if defined(OS_LINUX) || defined(OS_MAC)
+
+static const bool result = [] {
+            const char *Terms[]
+              = { "ansi",    "color",  "console", "cygwin", "gnome",
+                  "konsole", "kterm",  "linux",   "msys",   "putty",
+                  "rxvt",    "screen", "vt100",   "xterm" };
+
+            const char *env_p = std::getenv("TERM");
+            if (env_p == nullptr) {
+                return false;
+            }
+            return std::any_of(std::begin(Terms), std::end(Terms),
+                               [&](const char *term) {
+                                   return std::strstr(env_p, term) != nullptr;
+                               });
+        }();
+
+#elif defined(OS_WIN)
+// All windows versions support colors through native console methods
+        static constexpr bool result = true;
+#endif
+return result;
+}
+
+#ifdef OS_WIN
+
+
+inline bool isMsysPty(int fd) noexcept
+    {
+        // Dynamic load for binary compability with old Windows
+        const auto ptrGetFileInformationByHandleEx
+          = reinterpret_cast<decltype(&GetFileInformationByHandleEx)>(
+            GetProcAddress(GetModuleHandle(TEXT("kernel32.dll")),
+                           "GetFileInformationByHandleEx"));
+        if (!ptrGetFileInformationByHandleEx) {
+            return false;
+        }
+
+        HANDLE h = reinterpret_cast<HANDLE>(_get_osfhandle(fd));
+        if (h == INVALID_HANDLE_VALUE) {
+            return false;
+        }
+
+        // Check that it's a pipe:
+        if (GetFileType(h) != FILE_TYPE_PIPE) {
+            return false;
+        }
+
+        // POD type is binary compatible with FILE_NAME_INFO from WinBase.h
+        // It have the same alignment and used to avoid UB in caller code
+        struct MY_FILE_NAME_INFO {
+            DWORD FileNameLength;
+            WCHAR FileName[MAX_PATH];
+        };
+
+        auto pNameInfo = std::unique_ptr<MY_FILE_NAME_INFO>(
+          new (std::nothrow) MY_FILE_NAME_INFO());
+        if (!pNameInfo) {
+            return false;
+        }
+
+        // Check pipe name is template of
+        // {"cygwin-","msys-"}XXXXXXXXXXXXXXX-ptyX-XX
+        if (!ptrGetFileInformationByHandleEx(h, FileNameInfo, pNameInfo.get(),
+                                             sizeof(MY_FILE_NAME_INFO))) {
+            return false;
+        }
+        std::wstring name(pNameInfo->FileName, pNameInfo->FileNameLength / sizeof(WCHAR));
+        if ((name.find(L"msys-") == std::wstring::npos
+             && name.find(L"cygwin-") == std::wstring::npos)
+            || name.find(L"-pty") == std::wstring::npos) {
+            return false;
+        }
+
+        return true;
+    }
+
+#endif
+
+inline bool isTerminal(const std::streambuf *osbuf) noexcept
+{
+using std::cerr;
+using std::clog;
+using std::cout;
+#if defined(OS_LINUX) || defined(OS_MAC)
+if (osbuf == cout.rdbuf()) {
+            static const bool cout_term = isatty(fileno(stdout)) != 0;
+            return cout_term;
+        } else if (osbuf == cerr.rdbuf() || osbuf == clog.rdbuf()) {
+            static const bool cerr_term = isatty(fileno(stderr)) != 0;
+            return cerr_term;
+        }
+#elif defined(OS_WIN)
+if (osbuf == cout.rdbuf()) {
+            static const bool cout_term
+              = (_isatty(_fileno(stdout)) || isMsysPty(_fileno(stdout)));
+            return cout_term;
+        } else if (osbuf == cerr.rdbuf() || osbuf == clog.rdbuf()) {
+            static const bool cerr_term
+              = (_isatty(_fileno(stderr)) || isMsysPty(_fileno(stderr)));
+            return cerr_term;
+        }
+#endif
+return false;
+}
+
+template <typename T>
+using enableStd = typename std::enable_if<
+	std::is_same<T, rang::style>::value || std::is_same<T, rang::fg>::value
+	|| std::is_same<T, rang::bg>::value || std::is_same<T, rang::fgB>::value
+	|| std::is_same<T, rang::bgB>::value,
+	std::ostream &>::type;
+
+
+#ifdef OS_WIN
+
+struct SGR {  // Select Graphic Rendition parameters for Windows console
+        BYTE fgColor;  // foreground color (0-15) lower 3 rgb bits + intense bit
+        BYTE bgColor;  // background color (0-15) lower 3 rgb bits + intense bit
+        BYTE bold;  // emulated as FOREGROUND_INTENSITY bit
+        BYTE underline;  // emulated as BACKGROUND_INTENSITY bit
+        BOOLEAN inverse;  // swap foreground/bold & background/underline
+        BOOLEAN conceal;  // set foreground/bold to background/underline
+    };
+
+    enum class AttrColor : BYTE {  // Color attributes for console screen buffer
+        black   = 0,
+        red     = 4,
+        green   = 2,
+        yellow  = 6,
+        blue    = 1,
+        magenta = 5,
+        cyan    = 3,
+        gray    = 7
+    };
+
+    inline HANDLE getConsoleHandle(const std::streambuf *osbuf) noexcept
+    {
+        if (osbuf == std::cout.rdbuf()) {
+            static const HANDLE hStdout = GetStdHandle(STD_OUTPUT_HANDLE);
+            return hStdout;
+        } else if (osbuf == std::cerr.rdbuf() || osbuf == std::clog.rdbuf()) {
+            static const HANDLE hStderr = GetStdHandle(STD_ERROR_HANDLE);
+            return hStderr;
+        }
+        return INVALID_HANDLE_VALUE;
+    }
+
+    inline bool setWinTermAnsiColors(const std::streambuf *osbuf) noexcept
+    {
+        HANDLE h = getConsoleHandle(osbuf);
+        if (h == INVALID_HANDLE_VALUE) {
+            return false;
+        }
+        DWORD dwMode = 0;
+        if (!GetConsoleMode(h, &dwMode)) {
+            return false;
+        }
+        dwMode |= ENABLE_VIRTUAL_TERMINAL_PROCESSING;
+        if (!SetConsoleMode(h, dwMode)) {
+            return false;
+        }
+        return true;
+    }
+
+    inline bool supportsAnsi(const std::streambuf *osbuf) noexcept
+    {
+        using std::cerr;
+        using std::clog;
+        using std::cout;
+        if (osbuf == cout.rdbuf()) {
+            static const bool cout_ansi
+              = (isMsysPty(_fileno(stdout)) || setWinTermAnsiColors(osbuf));
+            return cout_ansi;
+        } else if (osbuf == cerr.rdbuf() || osbuf == clog.rdbuf()) {
+            static const bool cerr_ansi
+              = (isMsysPty(_fileno(stderr)) || setWinTermAnsiColors(osbuf));
+            return cerr_ansi;
+        }
+        return false;
+    }
+
+    inline const SGR &defaultState() noexcept
+    {
+        static const SGR defaultSgr = []() -> SGR {
+            CONSOLE_SCREEN_BUFFER_INFO info;
+            WORD attrib = FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE;
+            if (GetConsoleScreenBufferInfo(GetStdHandle(STD_OUTPUT_HANDLE),
+                                           &info)
+                || GetConsoleScreenBufferInfo(GetStdHandle(STD_ERROR_HANDLE),
+                                              &info)) {
+                attrib = info.wAttributes;
+            }
+            SGR sgr     = { 0, 0, 0, 0, FALSE, FALSE };
+            sgr.fgColor = attrib & 0x0F;
+            sgr.bgColor = (attrib & 0xF0) >> 4;
+            return sgr;
+        }();
+        return defaultSgr;
+    }
+
+    inline BYTE ansi2attr(BYTE rgb) noexcept
+    {
+        static const AttrColor rev[8]
+          = { AttrColor::black,  AttrColor::red,  AttrColor::green,
+              AttrColor::yellow, AttrColor::blue, AttrColor::magenta,
+              AttrColor::cyan,   AttrColor::gray };
+        return static_cast<BYTE>(rev[rgb]);
+    }
+
+    inline void setWinSGR(rang::bg col, SGR &state) noexcept
+    {
+        if (col != rang::bg::reset) {
+            state.bgColor = ansi2attr(static_cast<BYTE>(col) - 40);
+        } else {
+            state.bgColor = defaultState().bgColor;
+        }
+    }
+
+    inline void setWinSGR(rang::fg col, SGR &state) noexcept
+    {
+        if (col != rang::fg::reset) {
+            state.fgColor = ansi2attr(static_cast<BYTE>(col) - 30);
+        } else {
+            state.fgColor = defaultState().fgColor;
+        }
+    }
+
+    inline void setWinSGR(rang::bgB col, SGR &state) noexcept
+    {
+        state.bgColor = (BACKGROUND_INTENSITY >> 4)
+          | ansi2attr(static_cast<BYTE>(col) - 100);
+    }
+
+    inline void setWinSGR(rang::fgB col, SGR &state) noexcept
+    {
+        state.fgColor
+          = FOREGROUND_INTENSITY | ansi2attr(static_cast<BYTE>(col) - 90);
+    }
+
+    inline void setWinSGR(rang::style style, SGR &state) noexcept
+    {
+        switch (style) {
+            case rang::style::reset: state = defaultState(); break;
+            case rang::style::bold: state.bold = FOREGROUND_INTENSITY; break;
+            case rang::style::underline:
+            case rang::style::blink:
+                state.underline = BACKGROUND_INTENSITY;
+                break;
+            case rang::style::reversed: state.inverse = TRUE; break;
+            case rang::style::conceal: state.conceal = TRUE; break;
+            default: break;
+        }
+    }
+
+    inline SGR &current_state() noexcept
+    {
+        static SGR state = defaultState();
+        return state;
+    }
+
+    inline WORD SGR2Attr(const SGR &state) noexcept
+    {
+        WORD attrib = 0;
+        if (state.conceal) {
+            if (state.inverse) {
+                attrib = (state.fgColor << 4) | state.fgColor;
+                if (state.bold)
+                    attrib |= FOREGROUND_INTENSITY | BACKGROUND_INTENSITY;
+            } else {
+                attrib = (state.bgColor << 4) | state.bgColor;
+                if (state.underline)
+                    attrib |= FOREGROUND_INTENSITY | BACKGROUND_INTENSITY;
+            }
+        } else if (state.inverse) {
+            attrib = (state.fgColor << 4) | state.bgColor;
+            if (state.bold) attrib |= BACKGROUND_INTENSITY;
+            if (state.underline) attrib |= FOREGROUND_INTENSITY;
+        } else {
+            attrib = state.fgColor | (state.bgColor << 4) | state.bold
+              | state.underline;
+        }
+        return attrib;
+    }
+
+    template <typename T>
+    inline void setWinColorAnsi(std::ostream &os, T const value)
+    {
+        os << "\033[" << static_cast<int>(value) << "m";
+    }
+
+    template <typename T>
+    inline void setWinColorNative(std::ostream &os, T const value)
+    {
+        const HANDLE h = getConsoleHandle(os.rdbuf());
+        if (h != INVALID_HANDLE_VALUE) {
+            setWinSGR(value, current_state());
+            // Out all buffered text to console with previous settings:
+            os.flush();
+            SetConsoleTextAttribute(h, SGR2Attr(current_state()));
+        }
+    }
+
+    template <typename T>
+    inline enableStd<T> setColor(std::ostream &os, T const value)
+    {
+        if (winTermMode() == winTerm::Auto) {
+            if (supportsAnsi(os.rdbuf())) {
+                setWinColorAnsi(os, value);
+            } else {
+                setWinColorNative(os, value);
+            }
+        } else if (winTermMode() == winTerm::Ansi) {
+            setWinColorAnsi(os, value);
+        } else {
+            setWinColorNative(os, value);
+        }
+        return os;
+    }
+#else
+template <typename T>
+inline enableStd<T> setColor(std::ostream &os, T const value)
+{
+	return os << "\033[" << static_cast<int>(value) << "m";
+}
+#endif
+}  // namespace rang_implementation
+
+template <typename T>
+inline rang_implementation::enableStd<T> operator<<(std::ostream &os,
+													const T value)
+{
+	const control option = rang_implementation::controlMode();
+	switch (option) {
+		case control::Auto:
+			return rang_implementation::supportsColor()
+				   && rang_implementation::isTerminal(os.rdbuf())
+				? rang_implementation::setColor(os, value)
+				: os;
+		case control::Force: return rang_implementation::setColor(os, value);
+		default: return os;
+	}
+}
+
+inline void setWinTermMode(const rang::winTerm value) noexcept
+{
+rang_implementation::winTermMode() = value;
+}
+
+inline void setControlMode(const control value) noexcept
+{
+rang_implementation::controlMode() = value;
+}
+
+}  // namespace rang
+
+#undef OS_LINUX
+#undef OS_WIN
+#undef OS_MAC
+
+#endif /* ifndef RANG_DOT_HPP */

common/zone_store.cpp

@@ -30,7 +30,7 @@ void ZoneStore::LoadZones(Database &db)
 {
 	m_zones = ZoneRepository::All(db);
 
-	LogInfo("[ZoneStore] Loaded [{}] zones", m_zones.size());
+	LogInfo("Loaded [{}] zones", m_zones.size());
 }
 
 /**