Changeset 511

Timestamp:

05/23/16 13:48:45 (9 years ago)

Author:

Maciej Komosinski

Message:

Improved handling of multiline messages by loggers

Location:

cpp/common

Files:

• log.cpp (modified) (1 diff)
• log.h (modified) (1 diff)
• loggers/loggers.cpp (modified) (2 diffs)
• loggers/loggers.h (modified) (1 diff)
• loggers/loggertostdout.cpp (modified) (1 diff)
• loggers/loggertostdout.h (modified) (1 diff)

cpp/common/log.cpp

@@ -9 +9 @@
 
 const char* LOG_LEVEL[] = { "[DEBUG] ", "", "[WARN] ", "[ERROR] ", "[CRITICAL] " };
-
-void logMessage(const char *obj, const char *method, int level, const char *msg)
-{
-        int line = 0; //all lines except the first one get the "..." prefix
-        const char* nextsep;
-        do
-        {
-                nextsep = strchr(msg, '\n');
-                if (nextsep == NULL) //last chunk, until the end
-                        nextsep = strchr(msg, '\0');
-                if ((nextsep > msg) && (nextsep[-1] == '\r'))
-                        nextsep--;
-                if (line == 0)
-                {
-                        if (*nextsep == 0) //there was only one line! no need to modify it in any way.
-                                _logMessageSingleLine(obj, method, level, msg);
-                        else //first line from multi-line
-                                _logMessageSingleLine(obj, method, level, string(msg, nextsep - msg).c_str());
-                }
-                else //consecutive lines from multi-line
-                        _logMessageSingleLine(obj, method, level, (LOG_MULTILINE_CONTINUATION + string(msg, nextsep - msg)).c_str()); //could also add line numbers like ...(3)... but let's keep the prefix short and simple
-                line++;
-                if ((nextsep[0] == '\r') && (nextsep[1] == '\n'))
-                        msg = nextsep + 2;
-                else if (*nextsep)
-                        msg = nextsep + 1;
-        } while (*nextsep);
-}
-
 
 void logPrintf_va(const char *obj, const char *method, int level, const char *msgf, va_list va)

cpp/common/log.h

@@ -18 +18 @@
 void logMessage(const char *obj, const char *method, int level, const char *msg);
 
-void _logMessageSingleLine(const char *obj, const char *method, int level, const char *msg); //don't call this directly - it is used internally
-
-
 
 //level (importance) of a message

cpp/common/loggers/loggers.cpp

@@ -5 +5 @@
 #include "loggers.h"
 #include <common/stl-util.h>
+#include <string.h>
 
-void _logMessageSingleLine(const char *obj, const char *method, int level, const char *msg)
+void logMessage(const char *obj, const char *method, int level, const char *msg)
 {
         tlsGetRef(message_handler_manager_instance).send(obj, method, level, msg);
@@ -101 +102 @@
 }
 
+void LoggerBase::handle(const char *obj, const char *method, int level, const char *msg)
+{
+        int line = 0; //all lines except the first one get the "..." prefix
+        const char* nextsep;
+        do
+        {
+                nextsep = strchr(msg, '\n');
+                if (nextsep == NULL) //last chunk, until the end
+                        nextsep = strchr(msg, '\0');
+                if ((nextsep > msg) && (nextsep[-1] == '\r'))
+                        nextsep--;
+                if (line == 0)
+                {
+                        if (*nextsep == 0) //there was only one line! no need to modify it in any way.
+                                handleSingleLine(obj, method, level, msg);
+                        else //first line from multi-line
+                                handleSingleLine(obj, method, level, string(msg, nextsep - msg).c_str());
+                }
+                else //consecutive lines from multi-line
+                        handleSingleLine(obj, method, level, (LOG_MULTILINE_CONTINUATION + string(msg, nextsep - msg)).c_str()); //could also add line numbers like ...(3)... but let's keep the prefix short and simple
+                line++;
+                if ((nextsep[0] == '\r') && (nextsep[1] == '\n'))
+                        msg = nextsep + 2;
+                else if (*nextsep)
+                        msg = nextsep + 1;
+        } while (*nextsep);
+}
+
 /////////////////////////////////
 

cpp/common/loggers/loggers.h

@@ -71 +71 @@
         }
 
-        virtual void handle(const char *obj, const char *method, int level, const char *msg) {}
+        virtual void handle(const char *obj, const char *method, int level, const char *msg); ///< implemented by loggers accepting multiline messages. if not implemented, the default handle() splits multiline text into single lines and calls handleSingleLine()
+        virtual void handleSingleLine(const char *obj, const char *method, int level, const char *msg) {}  ///< implemented by loggers expecting single line messages
 };
 

cpp/common/loggers/loggertostdout.cpp

@@ -27 +27 @@
 }
 
-void LoggerToStdout::handle(const char *obj, const char *method, int level, const char *msg)
+void LoggerToStdout::handleSingleLine(const char *obj, const char *method, int level, const char *msg)
 {
         if (level < -1) level = -1; else if (level>3) level = 3;

cpp/common/loggers/loggertostdout.h

@@ -14 +14 @@
 public:
         LoggerToStdout(int opts = 0, VirtFILE *_file = NULL);
-        void handle(const char *obj, const char *method, int level, const char *msg);
+        void handleSingleLine(const char *obj, const char *method, int level, const char *msg);
 
         static const char* default_log_format[];