.gitignore

@@ -1,4 +1,3 @@
 .vscode
-example
+example/*
 test/*.o
-build

.vscode/settings.json

@@ -5,9 +5,6 @@
         "fstream": "cpp",
         "*.tcc": "cpp",
         "ostream": "cpp",
-        "mutex": "cpp",
+        "mutex": "cpp"
-        "queue": "cpp",
-        "array": "cpp",
-        "string_view": "cpp"
     }
 }

CMakeLists.txt

@@ -1,30 +0,0 @@
-cmake_minimum_required(VERSION 3.10)
-
-project(log)
-
-# Postavi verziju projekta
-set(CMAKE_CXX_STANDARD 11)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-
-# Pronađi Boost biblioteku (ako nije uobičajeni direktorijum, postavi put)
-# find_package(Boost REQUIRED COMPONENTS system)
-
-# Dodaj direktorijume sa zaglavljima
-include_directories(lib)
-
-# Dodaj biblioteku
-add_library(log STATIC
-    src/log.cpp
-)
-
-# # Linkaj log biblioteku sa Boost-om
-# target_link_libraries(log Boost::system)
-
-# Dodaj testove
-add_subdirectory(test)
-
-
-# Instaliraj biblioteku
-# install(TARGETS log DESTINATION lib)
-# install(FILES lib/log.hpp lib/define.hpp lib/engine.hpp lib/filesystem.hpp lib/timers.hpp lib/trigger.hpp DESTINATION include/log)
-# 

example/2023-05-21.log

@@ -0,0 +1 @@
+23:08:58 [EVENT] Start loging

example/2023-07-27.log

@@ -0,0 +1,3 @@
+18:29:30 [EVENT] Start loging
+18:29:44 [EVENT] Start loging
+18:29:47 [EVENT] Start loging

example/2023-5-20.log

@@ -0,0 +1,5 @@
+[EVENT] Start loging
+[EVENT] Start loging
+10:58:12 [EVENT] Start loging
+10:59:19 [EVENT] Start loging
+11:00:17 [EVENT] Start loging

example/2023-5-21.log

@@ -0,0 +1,2 @@
+11:00:58 [EVENT] Start loging
+13:02:17 [EVENT] Start loging

lib/log.hpp

@@ -9,13 +9,11 @@
 #include <time.h>
 #include <sys/stat.h>
 #include <mutex>
-#include <queue>
 
 #if _WIN32
 typedef unsigned int uint;
 #endif
 namespace marcelb {
-namespace logging {
 
 using namespace std;
 
@@ -40,9 +38,6 @@ 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
@@ -79,18 +74,6 @@ class log {
     */
     void put(string logline, Level _level);
 
-    /**
-     * Write to log file
-     */
-
-    void write(string logline);
-
-    void midnight();
-
-    void writeQueue();
-
-    bool writableQueue();
-
     public:
 
     /**
@@ -99,7 +82,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, uint32_t groupedWriting = 0);
+    log (string _dir, Level loglevel = WARNING, bool _isKeepOpen = true, bool _printInConsole = false);
 
 
     /**
@@ -133,7 +116,6 @@ class log {
     ~log();
 };
 
-}
 }
 
 #endif

src/log.cpp

@@ -1,14 +1,10 @@
 #include "../lib/log.hpp"
 
-namespace marcelb {
+marcelb::log::log(string _dir, Level _loglevel, bool _isKeepOpen, bool _printInConsole) {
-namespace logging {
-
-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 ");
@@ -16,9 +12,6 @@ log::log(string _dir, Level _loglevel, bool _isKeepOpen, bool _printInConsole, u
 
    setMoment();
    day = moment->tm_mday;
-   if (groupedWriting) {
-      lastWriting = timelocal(moment);
-   }
    setPath();
 
    if (isKeepOpen) {
@@ -29,28 +22,28 @@ log::log(string _dir, Level _loglevel, bool _isKeepOpen, bool _printInConsole, u
 
 }
 
-bool log::isdir() {
+bool marcelb::log::isdir() {
    struct stat sb;
    return stat(dir.c_str(), &sb) == 0;
 }
 
-bool log::open() {
+bool marcelb::log::open() {
    logfile = ofstream (path, ios_base::app);
    return logfile.is_open();
 }
 
 
-void log::loose() {
+void marcelb::log::loose() {
    logfile.close();
 }
 
-void log::setMoment() {
+void marcelb::log::setMoment() {
    time_t rawtime;
    time (&rawtime);
    moment = localtime (&rawtime);
 }
 
-void log::put(string logline, Level _level) {
+void marcelb::log::put(string logline, Level _level) {
    if (_level < loglevel)  {
       return;
    }
@@ -61,40 +54,8 @@ void log::put(string logline, Level _level) {
 
    setMoment();
    setPrefix(logline, _level);
-   midnight();
 
-   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! ");
-      }
-   }
-
-   logfile << logline << endl;
-
-   if (!isKeepOpen && logfile.is_open()) {
-      loose();
-   }
-}
-
-void log::midnight() {
    if (day != moment->tm_mday) {
-      if (groupedWriting && !toWrite.empty()) {
-         writeQueue();
-      }
-
       if (isKeepOpen && logfile.is_open()) {
          loose();
       }
@@ -106,33 +67,23 @@ void log::midnight() {
          }
       }
    }
-}
 
-void log::writeQueue() {
+   if (!isKeepOpen || !logfile.is_open()) {      
-   string lines;
+      if (!open()) {
-   bool notEmpty = !toWrite.empty();
+         throw string("[ERROR] Opening log file! ");
-
+      }
-   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;
+
+   logfile << logline << endl;
+
+   if (!isKeepOpen && logfile.is_open()) {
+      loose();
+   }
+   io.unlock();
+
 }
 
-void log::setPath() {
+void marcelb::log::setPath() {
    if (dir[dir.length()-1] != '/') {
       dir.push_back('/');
    }
@@ -143,7 +94,7 @@ void log::setPath() {
    path = dir + to_string(moment->tm_year+1900) + '-' + mon.str() + '-' + _day.str() + ".log";
 }
 
-void log::setPrefix(string &logline, Level &_level) {
+void marcelb::log::setPrefix(string &logline, Level &_level) {
    stringstream hour, min, sec;
    hour << setw(2) << setfill('0') << moment->tm_hour;
    min << setw(2) << setfill('0') << moment->tm_min;
@@ -174,31 +125,28 @@ void log::setPrefix(string &logline, Level &_level) {
    logline = _logline + logline;
 }
 
-void log::debug(string logline) {
+void marcelb::log::debug(string logline) {
    put(logline, DEBUG);
 }
 
-void log::info(string logline) {
+void marcelb::log::info(string logline) {
    put(logline, INFO);
 }
 
-void log::warning(string logline) {
+void marcelb::log::warning(string logline) {
    put(logline, WARNING);
 }
 
-void log::error(string logline) {
+void marcelb::log::error(string logline) {
    put(logline, ERROR);
 }
 
-void log::fatal(string logline) {
+void marcelb::log::fatal(string logline) {
    put(logline, FATAL);
 }
 
 
-log::~log() {
+marcelb::log::~log() {
    loose();
 }
 
-
-}
-}

test/CMakeLists.txt

@@ -1,3 +0,0 @@
-add_executable(log_test test.cpp)
-
-target_link_libraries(log_test log)

test/test.cpp

@@ -1,25 +1,18 @@
 #include <iostream>
-#include <unistd.h>
 
 #include "../lib/log.hpp"
 
 using namespace std;
-using namespace marcelb::logging;
+using namespace marcelb;
 
-log mylog("../example", Level::DEBUG, true, false, 5);
+log mylog("../example", Level::FATAL, false);
 
 int main() {
-    // mylog.debug("Start debug loging");
+    mylog.debug("Start debug loging");
-    // mylog.info("Start info loging");
+    mylog.info("Start info loging");
-    // mylog.warning("Start warning loging");
+    mylog.warning("Start warning loging");
-    // mylog.error("Start error loging");
+    mylog.error("Start error loging");
-    // mylog.fatal("Start fatal loging");
+    mylog.fatal("Start fatal loging");
-
-    int i = 0;
-    while(true) {
-        mylog.fatal("Test fatal error: "+ to_string(i++));
-        sleep(2);
-    }
 
     return 0;
 }