copy Log.{h,cpp} improvements from dabmux

2 files changed, 71 insertions, 29 deletions

diff --git a/src/Log.cpp b/src/Log.cpp
index 91fd278..e428a0b 100644
--- a/src/Log.cpp
+++ b/src/Log.cpp
@@ -3,8 +3,7 @@
    Her Majesty the Queen in Right of Canada (Communications Research
    Center Canada)
 
-   Includes modifications for which no copyright is claimed
-   2012, Matthias P. Braendli, matthias.braendli@mpb.li
+   Copyright (C), 2014, Matthias P. Braendli, matthias.braendli@mpb.li
  */
 /*
    This file is part of CRC-DADMOD.
@@ -24,31 +23,62 @@
  */
 
 #include <list>
+#include <stdarg.h>
 
 #include "Log.h"
-#include "porting.h"
 
+Logger etiLog;
 
-Logger::Logger() {
-}
 
-void
-Logger::register_backend(LogBackend* backend) {
+void Logger::register_backend(LogBackend* backend) {
     backends.push_back(backend);
     //log(info, "Registered new logger " + backend->get_name());
 }
 
 
-void
-Logger::log(log_level_t level, std::string message) {
-    for (std::list<LogBackend*>::iterator it = backends.begin(); it != backends.end(); ++it) {
+void Logger::log(log_level_t level, const char* fmt, ...)
+{
+    int size = 100;
+    std::string str;
+    va_list ap;
+    while (1) {
+        str.resize(size);
+        va_start(ap, fmt);
+        int n = vsnprintf((char *)str.c_str(), size, fmt, ap);
+        va_end(ap);
+        if (n > -1 && n < size) {
+            str.resize(n);
+            break;
+        }
+        if (n > -1)
+            size = n + 1;
+        else
+            size *= 2;
+    }
+
+    logstr(level, str);
+}
+
+void Logger::logstr(log_level_t level, std::string message)
+{
+    /* Remove a potential trailing newline.
+     * It doesn't look good in syslog
+     */
+    if (message[message.length()-1] == '\n') {
+        message.resize(message.length()-1);
+    }
+
+    for (std::list<LogBackend*>::iterator it = backends.begin();
+            it != backends.end();
+            ++it) {
         (*it)->log(level, message);
     }
+
+    std::cerr << levels_as_str[level] << " " << message << std::endl;
 }
 
 
-LogLine
-Logger::level(log_level_t level)
+LogLine Logger::level(log_level_t level)
 {
     return LogLine(this, level);
 }
diff --git a/src/Log.h b/src/Log.h
index 885778f..4f911dc 100644
--- a/src/Log.h
+++ b/src/Log.h
@@ -3,8 +3,7 @@
    Her Majesty the Queen in Right of Canada (Communications Research
    Center Canada)
 
-   Includes modifications for which no copyright is claimed
-   2012, Matthias P. Braendli, matthias.braendli@mpb.li
+   Copyright (C), 2014, Matthias P. Braendli, matthias.braendli@mpb.li
  */
 /*
    This file is part of CRC-DADMOD.
@@ -30,6 +29,7 @@
 #   include "config.h"
 #endif
 
+#include <stdarg.h>
 #include <stdio.h>
 #include <syslog.h>
 #include <fstream>
@@ -38,14 +38,16 @@
 #include <list>
 #include <stdexcept>
 #include <string>
+#include <map>
 
-#include "porting.h"
-
-#define SYSLOG_IDENT "CRC-DABMOD"
+#define SYSLOG_IDENT "CRC-DABMUX"
 #define SYSLOG_FACILITY LOG_LOCAL0
 
 enum log_level_t {debug = 0, info, warn, error, alert, emerg};
 
+const std::string levels_as_str[] =
+    { "     ", "     ", "WARN ", "ERROR", "ALERT", "EMERG"} ;
+
 /** Abstract class all backends must inherit from */
 class LogBackend {
     public:
@@ -76,7 +78,7 @@ class LogToSyslog : public LogBackend {
                 case error: syslog_level = LOG_ERR; break;
                 case emerg: syslog_level = LOG_EMERG; break;
             }
- 
+
             syslog(syslog_level, SYSLOG_IDENT " %s", message.c_str());
         }
 
@@ -90,11 +92,11 @@ class LogToFile : public LogBackend {
     public:
         LogToFile(std::string filename) {
             name = "FILE";
-            
+
             log_file = fopen(filename.c_str(), "a");
             if (log_file == NULL) {
                 fprintf(stderr, "Cannot open log file !");
-                throw new std::runtime_error("Cannot open log file !");
+                throw std::runtime_error("Cannot open log file !");
             }
         }
 
@@ -106,10 +108,12 @@ class LogToFile : public LogBackend {
 
         void log(log_level_t level, std::string message) {
 
-            const char* log_level_text[] = {"DEBUG", "INFO", "WARN", "ERROR", "ALERT", "EMERG"};
-            
+            const char* log_level_text[] =
+                {"DEBUG", "INFO", "WARN", "ERROR", "ALERT", "EMERG"};
+
             // fprintf is thread-safe
-            fprintf(log_file, "CRC-DABMOD: %s: %s\n", log_level_text[(size_t)level], message.c_str());
+            fprintf(log_file, "CRC-DABMUX: %s: %s\n",
+                    log_level_text[(size_t)level], message.c_str());
             fflush(log_file);
         }
 
@@ -124,21 +128,27 @@ class LogLine;
 
 class Logger {
     public:
-        Logger();
+        Logger() {};
 
         void register_backend(LogBackend* backend);
 
-        /* The LogLevel will call this when a line is complete */
-        void log(log_level_t level, std::string message);
+        /* Log the message to all backends */
+        void log(log_level_t level, const char* fmt, ...);
 
-        /* Return a LogLine for the given level */
+        void logstr(log_level_t level, std::string message);
+
+        /* Return a LogLine for the given level
+         * so that you can write etiLog.level(info) << "stuff = " << 21 */
         LogLine level(log_level_t level);
-        
+
     private:
         std::list<LogBackend*> backends;
 };
 
+extern Logger etiLog;
+
 // Accumulate a line of logs, using same syntax as stringstream
+// The line is logged when the LogLine gets destroyed
 class LogLine {
     public:
         LogLine(const LogLine& logline);
@@ -148,6 +158,7 @@ class LogLine {
             level_ = level;
         }
 
+        // Push the new element into the stringstream
         template <typename T>
         LogLine& operator<<(T s) {
             os << s;
@@ -156,7 +167,7 @@ class LogLine {
 
         ~LogLine()
         {
-            logger_->log(level_, os.str());
+            logger_->logstr(level_, os.str());
         }
 
     private:
@@ -167,3 +178,4 @@ class LogLine {
 
 
 #endif
+