[feat] Added file, line and function information as arguments.

Author: ad4220

src/utility/Logger.cpp

@@ -9,6 +9,7 @@
 
 
 #include "Logger.hpp"
+#include "Exceptions.hpp"
 #include <cstdio>
 #include <ctime>
 #include <iterator>
@@ -53,20 +54,22 @@ constexpr std::string_view Logger::getLevelName(Logger::Level level)
         case Logger::Level::debug:
             return "debug";
         default:
-            throw std::invalid_argument("Invalid Level enum.");
+            ThrowException("Invalid Level enum.");
     }
 }
 
-void Logger::log(Level level, std::string_view message)
+void Logger::log(Level level, const char *file, unsigned int line, const char *func, std::string_view message)
 {
-    if (isLoggable(level))
-    {
+    if (!isLoggable(level))
+        return;
 
-        std::time_t now = std::time(nullptr);
+    std::time_t now = std::time(nullptr);
 
-        char timestamp[std::size(Logger::timestampFormat)];
-        std::strftime(timestamp, std::size(Logger::timestampFormat),
-                      "%FT%TZ", std::localtime(&now));
-        logStream << '[' << timestamp << "] " << '(' << name << ") " << '[' << getLevelName(level) << "] " << message << '\n';
-    }
+    char timestamp[std::size(Logger::timestampFormat)];
+    std::strftime(timestamp, std::size(Logger::timestampFormat),
+                  "%FT%TZ", std::localtime(&now));
+
+    char outputInfo[1024];
+    snprintf(outputInfo, 1024, "[%s](%s)[%s]@%s:%d:%s() ", timestamp, name.c_str(), getLevelName(level).data(), file, line, func);
+    logStream << outputInfo << message << '\n';
 }

src/utility/Logger.hpp

@@ -7,6 +7,7 @@
  *
  */
 
+#pragma once
 
 #include <iostream>
 #include <string_view>
@@ -23,12 +24,12 @@ class Logger
 
     enum class Level
     {
-        error,
-        warning,
-        severe,
-        info,
+        debug,
         fine,
-        debug
+        info,
+        severe,
+        warning,
+        error
     };
 
     Logger(std::string_view name)
@@ -46,20 +47,20 @@ class Logger
     {
     }
 
-    void setFilter(Filter filterToSet) { filter = filterToSet; }
+    Logger() = delete;
+
+    void log(Level level, const char *file, unsigned int line, const char *func, std::string_view message);
 
-    void log(Level level, std::string_view message);
-    
-    inline void error(std::string_view message) { log(Level::error, message); };
-    inline void warning(std::string_view message) { log(Level::warning, message); };
-    inline void severe(std::string_view message) { log(Level::severe, message); };
-    inline void info(std::string_view message) { log(Level::info, message); };
-    inline void fine(std::string_view message) { log(Level::fine, message); };
-    inline void debug(std::string_view message) { log(Level::debug, message); };
+    inline void error(const char *file, unsigned int line, const char *func, std::string_view message) { log(Level::error, file, line, func, message); };
+    inline void warning(const char *file, unsigned int line, const char *func, std::string_view message) { log(Level::warning, file, line, func, message); };
+    inline void severe(const char *file, unsigned int line, const char *func, std::string_view message) { log(Level::severe, file, line, func, message); };
+    inline void info(const char *file, unsigned int line, const char *func, std::string_view message) { log(Level::info, file, line, func, message); };
+    inline void fine(const char *file, unsigned int line, const char *func, std::string_view message) { log(Level::fine, file, line, func, message); };
+    inline void debug(const char *file, unsigned int line, const char *func, std::string_view message) { log(Level::debug, file, line, func, message); };
 
 private:
-    std::string name;
-    Filter filter;
+    const std::string name;
+    const Filter filter;
     std::ostream &logStream;
 
     // ISO 8601 date time format