improve

cmake/modules/BaseConfig.cmake

@@ -92,6 +92,7 @@ endif(OPTIONS_ENABLE_OPENMP)
 # cmake -DDEBUG_LOG=ON ..
 if(DEBUG_LOG)
     add_definitions(-DDEBUG_LOG=ON)
+    add_definitions(-DSPDLOG_ACTIVE_LEVEL=SPDLOG_LEVEL_TRACE)
     log_option_enabled("DEBUG LOG")
 else()
     log_option_disabled("DEBUG LOG")

config.lua.dist

@@ -10,6 +10,7 @@ coreDirectory = "data"
 -- Set log level
 -- It can be trace, debug, info, warning, error, critical, off (default: info).
 -- NOTE: Will only display logs with level higher or equal the one set.
+-- NOTE: Debug and trace logs are only available if compiled in debug mode.
 logLevel = "info"
 
 --- Toggles the server's maintenance mode.
@@ -52,7 +53,7 @@ cleanProtectionZones = false
 -- Connection Config
 -- NOTE: allowOldProtocol can allow login on 10x protocol. (11.00)
 -- NOTE: maxPlayers set to 0 means no limit
--- NOTE: MaxPacketsPerSeconds if you change you will be subject to bugs by WPE, keep the default value of 25, 
+-- NOTE: MaxPacketsPerSeconds if you change you will be subject to bugs by WPE, keep the default value of 25,
 -- It's recommended to use a range like min 50 in this function, otherwise you will be disconnected after equipping two-handed distance weapons.
 ip = "127.0.0.1"
 allowOldProtocol = false

src/account/account.cpp

@@ -16,7 +16,6 @@
 #include "utils/definitions.hpp"
 #include "security/argon.hpp"
 #include "utils/tools.hpp"
-#include "lib/logging/log_with_spd_log.hpp"
 
 #include "enums/account_type.hpp"
 #include "enums/account_coins.hpp"

src/canary_server.cpp

@@ -205,7 +205,7 @@ void CanaryServer::logInfos() {
 	logger.info("{} - Version {}", ProtocolStatus::SERVER_NAME, SERVER_RELEASE_VERSION);
 #endif
 
-	logger.debug("Compiled with {}, on {} {}, for platform {}\n", getCompiler(), __DATE__, __TIME__, getPlatform());
+	logger.debug("Compiled with {}, on {} {}, for platform {}", getCompiler(), __DATE__, __TIME__, getPlatform());
 
 #if defined(LUAJIT_VERSION)
 	logger.debug("Linked with {} for Lua support", LUAJIT_VERSION);

src/config/configmanager.cpp

@@ -37,9 +37,7 @@ bool ConfigManager::load() {
 		return false;
 	}
 
-#ifndef DEBUG_LOG
 	g_logger().setLevel(loadStringConfig(L, LOGLEVEL, "logLevel", "info"));
-#endif
 
 	// Parse config
 	// Info that must be loaded one time (unless we reset the modules involved)

src/database/database.hpp

@@ -10,7 +10,7 @@
 #pragma once
 
 #include "declarations.hpp"
-#include "lib/logging/log_with_spd_log.hpp"
+#include "lib/logging/logger.hpp"
 
 #ifndef USE_PRECOMPILED_HEADERS
 	#include <mysql/mysql.h>

src/game/scheduling/task.cpp

@@ -11,7 +11,6 @@
 
 #include "task.hpp"
 
-#include "lib/logging/log_with_spd_log.hpp"
 #include "lib/metrics/metrics.hpp"
 
 std::atomic_uint_fast64_t Task::LAST_EVENT_ID = 0;

src/lib/CMakeLists.txt

@@ -1,6 +1,6 @@
 target_sources(${PROJECT_NAME}_lib PRIVATE
     di/soft_singleton.cpp
-    logging/log_with_spd_log.cpp
+    logging/logger.cpp
     thread/thread_pool.cpp
 )
 

src/lib/di/container.hpp

@@ -10,7 +10,7 @@
 
 #include "account/account_repository_db.hpp"
 #include "lib/di/injector.hpp"
-#include "lib/logging/log_with_spd_log.hpp"
+#include "lib/logging/logger.hpp"
 #include "kv/kv_sql.hpp"
 
 namespace di = boost::di;
@@ -21,7 +21,7 @@ class DI final {
 	const inline static auto defaultContainer = di::make_injector(
 		di::bind<AccountRepository>().to<AccountRepositoryDB>().in(di::singleton),
 		di::bind<KVStore>().to<KVSQL>().in(di::singleton),
-		di::bind<Logger>().to<LogWithSpdLog>().in(di::singleton)
+		di::bind<Logger>().to<Logger>().in(di::singleton)
 	);
 
 public:

src/lib/di/soft_singleton.hpp

@@ -9,7 +9,7 @@
 #pragma once
 
 #include <iostream>
-#include "lib/logging/log_with_spd_log.hpp"
+#include "lib/logging/logger.hpp"
 
 class SoftSingleton {
 public:

src/lib/logging/log_with_spd_log.cpp

@@ -1,93 +0,0 @@
-/**
- * Canary - A free and open-source MMORPG server emulator
- * Copyright (©) 2019-2024 OpenTibiaBR <[email protected]>
- * Repository: https://github.com/opentibiabr/canary
- * License: https://github.com/opentibiabr/canary/blob/main/LICENSE
- * Contributors: https://github.com/opentibiabr/canary/graphs/contributors
- * Website: https://docs.opentibiabr.com/
- */
-
-#include <spdlog/spdlog.h>
-#include <spdlog/sinks/basic_file_sink.h>
-#include <spdlog/sinks/stdout_color_sinks.h>
-
-#include "pch.hpp"
-#include "lib/di/container.hpp"
-
-LogWithSpdLog::LogWithSpdLog() {
-	setLevel("info");
-
-#ifdef DEBUG_LOG
-	spdlog::set_pattern("[%Y-%m-%d %H:%M:%S.%e] [thread %t] [%^%l%$] %v ");
-#else
-	spdlog::set_pattern("[%Y-%m-%d %H:%M:%S.%e] [%^%l%$] %v ");
-#endif
-
-	const std::tm local_tm = get_local_time();
-
-	std::ostringstream oss;
-	oss << std::put_time(&local_tm, "%Y-%m-%d_%H-%M-%S");
-	std::string filename = "log/server_log_" + oss.str() + ".txt";
-
-	try {
-		auto console_sink = std::make_shared<spdlog::sinks::stdout_color_sink_mt>();
-		auto file_sink = std::make_shared<spdlog::sinks::basic_file_sink_mt>(filename, true);
-
-		const auto combined_logger = std::make_shared<spdlog::logger>(
-			"",
-			spdlog::sinks_init_list { console_sink, file_sink }
-		);
-
-		combined_logger->set_level(spdlog::get_level());
-		combined_logger->flush_on(spdlog::level::info);
-
-		set_default_logger(combined_logger);
-
-		spdlog::info("Logger initialized and configured for console and file output.");
-	} catch (const spdlog::spdlog_ex &ex) {
-		std::cerr << "Log initialization failed: " << ex.what() << std::endl;
-	}
-}
-
-Logger &LogWithSpdLog::getInstance() {
-	return inject<Logger>();
-}
-
-void LogWithSpdLog::setLevel(const std::string &name) {
-	debug("Setting log level to: {}.", name);
-	const auto level = spdlog::level::from_str(name);
-	spdlog::set_level(level);
-}
-
-std::string LogWithSpdLog::getLevel() const {
-	const auto level = spdlog::level::to_string_view(spdlog::get_level());
-	return std::string { level.begin(), level.end() };
-}
-
-void LogWithSpdLog::log(const std::string &lvl, const fmt::basic_string_view<char> msg) const {
-	spdlog::log(spdlog::level::from_str(lvl), msg);
-}
-
-bool LogWithSpdLog::shouldLog(const std::string &lvl) const {
-	const auto currentLevel = spdlog::get_level();
-	const auto messageLevel = spdlog::level::from_str(lvl);
-	return messageLevel >= currentLevel;
-}
-
-void LogWithSpdLog::logProfile(const std::string &name, double duration_ms) const {
-	std::string filename = "log/profile_log-" + name + ".txt";
-
-	const auto it = profile_loggers_.find(filename);
-	if (it == profile_loggers_.end()) {
-		try {
-			auto file_sink = std::make_shared<spdlog::sinks::basic_file_sink_mt>(filename, true);
-			auto profile_logger = std::make_shared<spdlog::logger>("profile_logger_" + name, file_sink);
-			profile_loggers_[filename] = profile_logger;
-			profile_logger->info("Function {} executed in {} ms", name, duration_ms);
-		} catch (const spdlog::spdlog_ex &ex) {
-			std::cerr << "Profile log initialization failed: " << ex.what() << std::endl;
-		}
-	} else {
-		it->second->info("Function {} executed in {} ms", name, duration_ms);
-	}
-}

src/lib/logging/log_with_spd_log.hpp

@@ -1,36 +0,0 @@
-/**
- * Canary - A free and open-source MMORPG server emulator
- * Copyright (©) 2019-2024 OpenTibiaBR <[email protected]>
- * Repository: https://github.com/opentibiabr/canary
- * License: https://github.com/opentibiabr/canary/blob/main/LICENSE
- * Contributors: https://github.com/opentibiabr/canary/graphs/contributors
- * Website: https://docs.opentibiabr.com/
- */
-#pragma once
-
-#include "lib/logging/logger.hpp"
-
-namespace spdlog {
-	class logger; // Forward declaration
-}
-
-class LogWithSpdLog final : public Logger {
-public:
-	LogWithSpdLog();
-	~LogWithSpdLog() override = default;
-
-	static Logger &getInstance();
-
-	void setLevel(const std::string &name) override;
-	std::string getLevel() const override;
-	bool shouldLog(const std::string &lvl) const override;
-	void logProfile(const std::string &name, double duration_ms) const override;
-	void setupLogger() const;
-
-	void log(const std::string &lvl, fmt::basic_string_view<char> msg) const override;
-
-private:
-	mutable std::unordered_map<std::string, std::shared_ptr<spdlog::logger>> profile_loggers_;
-};
-
-constexpr auto g_logger = LogWithSpdLog::getInstance;

src/lib/logging/logger.cpp

@@ -0,0 +1,147 @@
+/**
+ * Canary - A free and open-source MMORPG server emulator
+ * Copyright (©) 2019-2024 OpenTibiaBR <[email protected]>
+ * Repository: https://github.com/opentibiabr/canary
+ * License: https://github.com/opentibiabr/canary/blob/main/LICENSE
+ * Contributors: https://github.com/opentibiabr/canary/graphs/contributors
+ * Website: https://docs.opentibiabr.com/
+ */
+
+#include <spdlog/spdlog.h>
+#include <spdlog/sinks/basic_file_sink.h>
+#include <spdlog/sinks/stdout_color_sinks.h>
+
+#include "pch.hpp"
+#include "lib/di/container.hpp"
+
+Logger::Logger() {
+	spdlog::set_pattern("[%Y-%d-%m %H:%M:%S.%e] [%^%l%$] %v ");
+
+#ifdef DEBUG_LOG
+	spdlog::set_level(spdlog::level::trace);
+	spdlog::set_pattern("[%Y-%d-%m %H:%M:%S.%e] [thread %t] [%^%l%$] %v ");
+#endif
+
+	const std::tm local_tm = get_local_time();
+
+	std::ostringstream oss;
+	oss << std::put_time(&local_tm, "%Y-%m-%d_%H-%M-%S");
+	std::string filename = "log/server_log_" + oss.str() + ".txt";
+
+	try {
+		// Limpar logs antigos
+		cleanOldLogs("log", 2);
+
+		auto console_sink = std::make_shared<spdlog::sinks::stdout_color_sink_mt>();
+		auto file_sink = std::make_shared<spdlog::sinks::basic_file_sink_mt>(filename, true);
+
+		const auto combined_logger = std::make_shared<spdlog::logger>(
+			"",
+			spdlog::sinks_init_list { console_sink, file_sink }
+		);
+
+		combined_logger->set_level(spdlog::get_level());
+
+		combined_logger->set_pattern("[%Y-%d-%m %H:%M:%S.%e] [%^%l%$] %v ");
+
+#ifdef DEBUG_LOG
+		combined_logger->set_pattern("[%Y-%d-%m %H:%M:%S.%e] [thread %t] [%^%l%$] %v ");
+#endif
+
+		combined_logger->flush_on(spdlog::level::info);
+
+		set_default_logger(combined_logger);
+
+		info("Logger initialized and configured for console and file output.");
+	} catch (const spdlog::spdlog_ex &ex) {
+		std::cerr << "Log initialization failed: " << ex.what() << std::endl;
+	}
+}
+
+Logger &Logger::getInstance() {
+	return inject<Logger>();
+}
+
+void Logger::setLevel(const std::string &name) const {
+	debug("Setting log level to: {}.", name);
+	const auto level = spdlog::level::from_str(name);
+	spdlog::set_level(level);
+}
+
+std::string Logger::getLevel() const {
+	const auto level = spdlog::level::to_string_view(spdlog::get_level());
+	return std::string { level.begin(), level.end() };
+}
+
+void Logger::logProfile(const std::string& name, double duration_ms) const {
+	std::string mutable_name = name;
+
+	std::ranges::replace(mutable_name, ':', '_');
+	std::ranges::replace(mutable_name, '\\', '_');
+	std::ranges::replace(mutable_name, '/', '_');
+
+	std::string filename = "log/profile_log-" + mutable_name + ".txt";
+
+	const auto it = profile_loggers_.find(filename);
+	if (it == profile_loggers_.end()) {
+		try {
+			auto file_sink = std::make_shared<spdlog::sinks::basic_file_sink_mt>(filename, true);
+			const auto profile_logger = std::make_shared<spdlog::logger>(mutable_name, file_sink);
+			profile_loggers_[filename] = profile_logger;
+			profile_logger->info("Function {} executed in {} ms", name, duration_ms);
+		} catch (const spdlog::spdlog_ex& ex) {
+			error("Profile log initialization failed: {}", ex.what());
+		}
+	} else {
+		it->second->info("Function {} executed in {} ms", mutable_name, duration_ms);
+	}
+}
+
+
+// Função para limpar logs antigos
+void Logger::cleanOldLogs(const std::string &logDirectory, int days) const {
+	namespace fs = std::filesystem;
+
+	const auto days_duration = std::chrono::hours(days * 24);
+
+	for (const auto &entry : fs::directory_iterator(logDirectory)) {
+		if (entry.is_regular_file()) {
+			auto ftime = fs::last_write_time(entry);
+
+			if (decltype(ftime)::clock::now() - ftime > days_duration) {
+				try {
+					fs::remove(entry.path());
+					debug("Deleted old log file: {}", entry.path().string());
+				} catch (const std::exception &e) {
+					debug("Failed to delete old log file: {}", entry.path().string());
+				}
+			}
+		}
+	}
+}
+
+void Logger::info(const std::string &msg) const {
+	SPDLOG_INFO(msg);
+}
+
+void Logger::warn(const std::string &msg) const {
+	SPDLOG_WARN(msg);
+}
+
+void Logger::error(const std::string &msg) const {
+	SPDLOG_WARN(msg);
+}
+
+void Logger::critical(const std::string &msg) const {
+	SPDLOG_WARN(msg);
+}
+
+#if defined(DEBUG_LOG)
+void Logger::debug(const std::string &msg) const {
+	SPDLOG_DEBUG(msg);
+}
+
+void Logger::trace(const std::string &msg) const {
+	SPDLOG_TRACE(msg);
+}
+#endif