Support grouped writing delayed by time

.gitignore

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

.vscode/settings.json

@@ -4,6 +4,10 @@
         "iosfwd": "cpp",
         "fstream": "cpp",
         "*.tcc": "cpp",
-        "ostream": "cpp"
+        "ostream": "cpp",
+        "mutex": "cpp",
+        "queue": "cpp",
+        "array": "cpp",
+        "string_view": "cpp"
     }
 }

CMakeLists.txt

@@ -0,0 +1,30 @@
+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)
+# 

LICENSE

@@ -0,0 +1,73 @@
+Apache License
+Version 2.0, January 2004
+http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document.
+
+"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.
+
+"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
+
+"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License.
+
+"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.
+
+"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types.
+
+"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below).
+
+"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.
+
+"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution."
+
+"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions:
+
+     (a) You must give any other recipients of the Work or Derivative Works a copy of this License; and
+
+     (b) You must cause any modified files to carry prominent notices stating that You changed the files; and
+
+     (c) You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and
+
+     (d) If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License.
+
+     You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work.
+
+To apply the Apache License to your work, attach the following boilerplate notice, with the fields enclosed by brackets "[]" replaced with your own identifying information. (Don't include the brackets!)  The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a file or class name and description of purpose be included on the same "printed page" as the copyright notice for easier identification within third-party archives.
+
+Copyright [2023] [Marcel Bandić - marcelb96@yahoo.com]
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.

README.md

@@ -1,5 +1,60 @@
 
-# A simple Logging library for C++
+# A simple Logging library for C++ programs
 
 Logging errors to a file, daily file rotation, date and time stamps. Configurable record structure etc. 
 
+
+## Features
+
+- Object oriented
+- Customizable directory for files
+- Daily file rotation
+- Protection of recording consecutive errors
+- Log levels
+- Thread safe
+- Exceptions
+- The possibility of printing logs in the console
+- Ability to keep log file open for faster speed
+- Supports multiple simultaneous log files by custom directories
+
+## Installation
+
+Just download the latest release and unzip it into your project. You can turn it on with:
+
+```
+#include "log/lib/log.hpp"
+using namespace marcelb;
+```
+
+## Usage
+
+```c++
+/**
+* Initialization and declaration
+*/
+log mylog("../log", Level::INFO);
+
+/**
+* Put log in file
+*/
+mylog.debug("Debug loging");
+mylog.info("Info loging");
+mylog.warning("Warning loging");
+mylog.error("Error loging");
+mylog.fatal("Fatal loging");
+```
+## License
+
+[APACHE 2.0](http://www.apache.org/licenses/LICENSE-2.0/)
+
+
+## Support & Feedback
+
+For support and any feedback, contact the address: marcelb96@yahoo.com.
+
+## Contributing
+
+Contributions are always welcome!
+
+Feel free to fork and start working with or without a later pull request. Or contact for suggest and request an option.
+

example/2023-05-21.log

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

example/2023-5-20.log

@@ -1,5 +0,0 @@
-[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

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

lib/log.hpp

@@ -4,34 +4,136 @@
 #include <iostream>
 #include <iomanip>
 #include <string>
+#include <sstream>
 #include <fstream>
 #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;
 
+typedef enum {
+    DEBUG = 0,
+    INFO,
+    WARNING,
+    ERROR,
+    FATAL,
+} Level;
+
+/**
+ * Log class - used at the level of one log directory
+*/
 class log {
-    public:
     string dir;
+    Level loglevel;
     bool isKeepOpen;
     bool printInConsole;
     ofstream logfile;
     struct tm * moment;
     uint day;
     string path;
+    mutex io;
+    uint32_t groupedWriting;
+    time_t lastWriting;
+    queue<string> toWrite;
 
-    log (string _dir, bool _isKeepOpen = true, bool _printInConsole = false);
-
+    /**
+     * Checking if the path is in the string dir directory
+    */
     bool isdir();
-    bool open();
-    void loose();
-    void setMoment();
-    void setPath();
-    void put(string logline);
-    void setPrefix(string &logline);
 
+    /**
+     * Opens the log file
+    */
+    bool open();
+
+    /**
+     * Closes the log file
+    */
+    void loose();
+
+    /**
+     * Get time
+    */
+    void setMoment();
+
+    /**
+     * Generate full log file path
+    */
+    void setPath();
+
+    /**
+     * Set log line time prefix
+    */
+    void setPrefix(string &logline, Level &_level);
+
+    /**
+     * Put string log in file
+    */
+    void put(string logline, Level _level);
+
+    /**
+     * Write to log file
+     */
+
+    void write(string logline);
+
+    void midnight();
+
+    void writeQueue();
+
+    bool writableQueue();
+
+    public:
+
+    /**
+     * Constructor,
+     * receives the log directory path,
+     * 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);
+
+
+    /**
+     * Debug log line
+    */
+    void debug(string logline);
+
+    /**
+     * Info log line
+    */
+    void info(string logline);
+
+    /**
+     * Warning log line
+    */
+    void warning(string logline);
+
+    /**
+     * Error log line
+    */
+    void error(string logline);
+
+    /**
+     * Fatal log line
+    */
+    void fatal(string logline);
+
+    /**
+     * Destruktor, close log files
+    */
     ~log();
 };
 
+}
+}
 
 #endif

src/log.cpp

@@ -1,21 +1,29 @@
 #include "../lib/log.hpp"
 
-log::log(string _dir, bool _isKeepOpen, bool _printInConsole = false) {
+namespace marcelb {
+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 "[ERROR] Log dir path invalid ";
+      throw string("[ERROR] Log dir path invalid ");
    }
 
    setMoment();
    day = moment->tm_mday;
+   if (groupedWriting) {
+      lastWriting = timelocal(moment);
+   }
    setPath();
 
    if (isKeepOpen) {
       if (!open()) {
-         throw "[ERROR] Opening log file! ";
+         throw string("[ERROR] Opening log file! ");
       }
    }
 
@@ -42,30 +50,35 @@ void log::setMoment() {
    moment = localtime (&rawtime);
 }
 
-void log::put(string logline) {
+void log::put(string logline, Level _level) {
+   if (_level < loglevel)  {
+      return;
+   }
+   io.lock();
    if (printInConsole) {
       cout << logline << endl;
    }
 
    setMoment();
-   setPrefix(logline);
+   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 "[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 "[ERROR] Opening log file! ";
+         throw string("[ERROR] Opening log file! ");
       }
    }
 
@@ -74,7 +87,49 @@ void log::put(string logline) {
    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();
+      }
+      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() {
@@ -88,17 +143,62 @@ void log::setPath() {
    path = dir + to_string(moment->tm_year+1900) + '-' + mon.str() + '-' + _day.str() + ".log";
 }
 
-void log::setPrefix(string &logline) {
+void 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;
    sec << setw(2) << setfill('0') << moment->tm_sec;
 
-   string _logline = hour.str() + ':' + min.str() + ':' + sec.str() + ' ' + logline;
-   logline = _logline;
+   string _logline = hour.str() + ':' + min.str() + ':' + sec.str();// + logline;
+   switch (_level) {
+      case DEBUG:
+         _logline += " [DEBUG]   ";
+         break;
+      case INFO:
+         _logline += " [INFO]    ";
+         break;
+      case WARNING:
+         _logline += " [WARNING] ";
+         break;
+      case ERROR:
+         _logline += " [ERROR]   ";
+         break;
+      case FATAL:
+         _logline += " [FATAL]   ";
+         break;
+      default:
+         _logline += " [UNAKOWN] ";
+         break;
+
+   }
+   logline = _logline + logline;
 }
 
+void log::debug(string logline) {
+   put(logline, DEBUG);
+}
+
+void log::info(string logline) {
+   put(logline, INFO);
+}
+
+void log::warning(string logline) {
+   put(logline, WARNING);
+}
+
+void log::error(string logline) {
+   put(logline, ERROR);
+}
+
+void log::fatal(string logline) {
+   put(logline, FATAL);
+}
+
+
 log::~log() {
    loose();
 }
 
+
+}
+}

test/CMakeLists.txt

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

test/compile.sh

@@ -1 +1 @@
-g++ test.cpp ../src/* -o test.o -l sqlite3
+g++ test.cpp ../src/* -o test.o

test/test.cpp

@@ -1,15 +1,25 @@
 #include <iostream>
+#include <unistd.h>
 
 #include "../lib/log.hpp"
 
 using namespace std;
-log mylog("../example", false);
+using namespace marcelb::logging;
+
+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");
 
-//     log mylog("../example", false);
-
-    mylog.put("[EVENT] Start loging");
+    int i = 0;
+    while(true) {
+        mylog.fatal("Test fatal error: "+ to_string(i++));
+        sleep(2);
+    }
 
     return 0;
 }