From af4ae684cdacd46739b0211594339b688a172535 Mon Sep 17 00:00:00 2001
From: ChancellorIkseew <156004311+ChancellorIkseew@users.noreply.github.com>
Date: Sun, 15 Jun 2025 03:50:58 +1000
Subject: [PATCH] debug::Logger refactoring (#534)

---
 src/debug/Logger.cpp | 17 ++++++++---------
 src/debug/Logger.hpp | 18 ++++--------------
 2 files changed, 12 insertions(+), 23 deletions(-)

diff --git a/src/debug/Logger.cpp b/src/debug/Logger.cpp
index 970b2102..12d8975a 100644
--- a/src/debug/Logger.cpp
+++ b/src/debug/Logger.cpp
@@ -2,25 +2,24 @@
 
 #include <chrono>
 #include <ctime>
+#include <fstream>
 #include <iomanip>
 #include <iostream>
+#include <mutex>
 #include <utility>
 
 using namespace debug;
 
-std::ofstream Logger::file;
-std::mutex Logger::mutex;
-std::string Logger::utcOffset = "";
-unsigned Logger::moduleLen = 20;
+static std::ofstream file;
+static std::mutex mutex;
+static std::string utcOffset = "";
+constexpr unsigned int moduleLen = 20;
 
 LogMessage::~LogMessage() {
     logger->log(level, ss.str());
 }
 
-Logger::Logger(std::string name) : name(std::move(name)) {
-}
-
-void Logger::log(
+static void write(
     LogLevel level, const std::string& name, const std::string& message
 ) {
     if (level == LogLevel::print) {
@@ -84,5 +83,5 @@ void Logger::flush() {
 }
 
 void Logger::log(LogLevel level, std::string message) {
-    log(level, name, std::move(message));
+    write(level, name, std::move(message));
 }
diff --git a/src/debug/Logger.hpp b/src/debug/Logger.hpp
index 9505affd..598dc4ef 100644
--- a/src/debug/Logger.hpp
+++ b/src/debug/Logger.hpp
@@ -1,7 +1,5 @@
 #pragma once
 
-#include <fstream>
-#include <mutex>
 #include <sstream>
 
 namespace debug {
@@ -27,24 +25,16 @@ namespace debug {
     };
 
     class Logger {
-        static std::mutex mutex;
-        static std::string utcOffset;
-        static std::ofstream file;
-        static unsigned moduleLen;
-
         std::string name;
-
-        static void log(
-            LogLevel level, const std::string& name, const std::string& message
-        );
     public:
         static void init(const std::string& filename);
         static void flush();
 
-        Logger(std::string name);
+        Logger(const std::string& name) : name(name) {
+        }
 
         void log(LogLevel level, std::string message);
-
+        
         LogMessage debug() {
             return LogMessage(this, LogLevel::debug);
         }
@@ -60,7 +50,7 @@ namespace debug {
         LogMessage warning() {
             return LogMessage(this, LogLevel::warning);
         }
-
+        
         /// @brief Print-debugging tool (printed without header)
         LogMessage print() {
             return LogMessage(this, LogLevel::print);