From 108e42ce1fb1b09b4687629dce30cd073307e24d Mon Sep 17 00:00:00 2001
From: mbandic <m.bandic@mandeks.ba>
Date: Fri, 4 Apr 2025 12:37:39 +0200
Subject: [PATCH] Support grouped writing delayed by time

---
 .vscode/settings.json |  5 +++-
 lib/log.hpp           | 18 ++++++++++-
 src/log.cpp           | 70 +++++++++++++++++++++++++++++++++++--------
 test/test.cpp         | 19 ++++++++----
 4 files changed, 92 insertions(+), 20 deletions(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 75ddc7f..45c3e36 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -5,6 +5,9 @@
         "fstream": "cpp",
         "*.tcc": "cpp",
         "ostream": "cpp",
-        "mutex": "cpp"
+        "mutex": "cpp",
+        "queue": "cpp",
+        "array": "cpp",
+        "string_view": "cpp"
     }
 }
\ No newline at end of file
diff --git a/lib/log.hpp b/lib/log.hpp
index a13c1c2..08c7c24 100644
--- a/lib/log.hpp
+++ b/lib/log.hpp
@@ -9,6 +9,7 @@
 #include <time.h>
 #include <sys/stat.h>
 #include <mutex>
+#include <queue>
 
 #if _WIN32
 typedef unsigned int uint;
@@ -39,6 +40,9 @@ class log {
     uint day;
     string path;
     mutex io;
+    uint32_t groupedWriting;
+    time_t lastWriting;
+    queue<string> toWrite;
 
     /**
      * Checking if the path is in the string dir directory
@@ -75,6 +79,18 @@ class log {
     */
     void put(string logline, Level _level);
 
+    /**
+     * Write to log file
+     */
+
+    void write(string logline);
+
+    void midnight();
+
+    void writeQueue();
+
+    bool writableQueue();
+
     public:
 
     /**
@@ -83,7 +99,7 @@ class log {
      * optional: a bool variable if it keeps the file open, 
      * and a bool variable if it prints log lines to the console
     */
-    log (string _dir, Level loglevel = WARNING, bool _isKeepOpen = true, bool _printInConsole = false);
+    log (string _dir, Level loglevel = WARNING, bool _isKeepOpen = true, bool _printInConsole = false, uint32_t groupedWriting = 0);
 
 
     /**
diff --git a/src/log.cpp b/src/log.cpp
index 8d6867a..7ad903a 100644
--- a/src/log.cpp
+++ b/src/log.cpp
@@ -3,11 +3,12 @@
 namespace marcelb {
 namespace logging {
 
-log::log(string _dir, Level _loglevel, bool _isKeepOpen, bool _printInConsole) {
+log::log(string _dir, Level _loglevel, bool _isKeepOpen, bool _printInConsole, uint32_t _groupedWriting) {
    dir = _dir;
    loglevel = _loglevel;
    isKeepOpen = _isKeepOpen;
    printInConsole = _printInConsole;
+   groupedWriting = _groupedWriting;
 
    if (!isdir()) {
       throw string("[ERROR] Log dir path invalid ");
@@ -15,6 +16,9 @@ log::log(string _dir, Level _loglevel, bool _isKeepOpen, bool _printInConsole) {
 
    setMoment();
    day = moment->tm_mday;
+   if (groupedWriting) {
+      lastWriting = timelocal(moment);
+   }
    setPath();
 
    if (isKeepOpen) {
@@ -57,20 +61,21 @@ void log::put(string logline, Level _level) {
 
    setMoment();
    setPrefix(logline, _level);
+   midnight();
 
-   if (day != moment->tm_mday) {
-      if (isKeepOpen && logfile.is_open()) {
-         loose();
-      }
-      day = moment->tm_mday;
-      setPath();
-      if (isKeepOpen) {
-         if (!open()) {
-            throw string("[ERROR] Opening log file! ");
-         }
+   if (groupedWriting) {
+      toWrite.push(logline);
+      if (writableQueue()) {
+         writeQueue();
       }
+   } else {
+      write(logline);
    }
+   io.unlock();
+}
 
+
+void log::write(string logline) {
    if (!isKeepOpen || !logfile.is_open()) {      
       if (!open()) {
          throw string("[ERROR] Opening log file! ");
@@ -82,8 +87,49 @@ void log::put(string logline, Level _level) {
    if (!isKeepOpen && logfile.is_open()) {
       loose();
    }
-   io.unlock();
+}
 
+void log::midnight() {
+   if (day != moment->tm_mday) {
+      if (groupedWriting && !toWrite.empty()) {
+         writeQueue();
+      }
+
+      if (isKeepOpen && logfile.is_open()) {
+         loose();
+      }
+      day = moment->tm_mday;
+      setPath();
+      if (isKeepOpen) {
+         if (!open()) {
+            throw string("[ERROR] Opening log file! ");
+         }
+      }
+   }
+}
+
+void log::writeQueue() {
+   string lines;
+   bool notEmpty = !toWrite.empty();
+
+   while (notEmpty) {
+      lines += toWrite.front();
+      toWrite.pop();
+      notEmpty = !toWrite.empty();
+      if (notEmpty) lines += "\n";
+    }
+
+   write(lines);
+}
+
+bool log::writableQueue() {
+   bool _writable = false;
+   auto _time = timelocal(moment);
+   if (_time > lastWriting + groupedWriting) {
+      _writable = true;
+      lastWriting = _time;
+   }
+   return _writable;
 }
 
 void log::setPath() {
diff --git a/test/test.cpp b/test/test.cpp
index c2ebe73..0c69585 100644
--- a/test/test.cpp
+++ b/test/test.cpp
@@ -1,18 +1,25 @@
 #include <iostream>
+#include <unistd.h>
 
 #include "../lib/log.hpp"
 
 using namespace std;
 using namespace marcelb::logging;
 
-log mylog("../example", Level::INFO, false);
+log mylog("../example", Level::DEBUG, true, false, 5);
 
 int main() {
-    mylog.debug("Start debug loging");
-    mylog.info("Start info loging");
-    mylog.warning("Start warning loging");
-    mylog.error("Start error loging");
-    mylog.fatal("Start fatal loging");
+    // mylog.debug("Start debug loging");
+    // mylog.info("Start info loging");
+    // mylog.warning("Start warning loging");
+    // mylog.error("Start error loging");
+    // mylog.fatal("Start fatal loging");
+
+    int i = 0;
+    while(true) {
+        mylog.fatal("Test fatal error: "+ to_string(i++));
+        sleep(2);
+    }
 
     return 0;
 }