Merge pull request #63 from sy-c/master

added INFOLOGGER_MODE=debug

Author: sy-c

doc/releaseNotes.md

@@ -83,3 +83,6 @@ This file describes the main feature changes for each InfoLogger released versio
 
 ## v1.3.22 - 15/02/2021
 - increased test timeout for slow machines
+
+## next version
+- added INFOLOGGER_MODE=debug. In this mode, infoLogger library prints on stdout one line per message, with a list of comma-separated field = value pairs. Undefined fields are not shown.

src/InfoLogger.cxx

@@ -265,6 +265,8 @@ class InfoLogger::Impl
             break;
           }
         }
+      } else {
+        break;
       }
       if (verbose) {
         printf("Output to %s failed\n", getStringFromMode(currentMode.mode));
@@ -302,6 +304,7 @@ class InfoLogger::Impl
                     file,
                     infoLoggerD,
                     raw,
+                    debug,
                     none };
 
   struct OutputStream {
@@ -332,6 +335,8 @@ class InfoLogger::Impl
       out.mode = OutputMode::infoLoggerD;
     } else if (!strcmp(s, "raw")) {
       out.mode = OutputMode::raw;
+    } else if (!strcmp(s, "debug")) {
+      out.mode = OutputMode::debug;
     } else if (!strcmp(s, "none")) {
       out.mode = OutputMode::none;
     } else {
@@ -348,6 +353,10 @@ class InfoLogger::Impl
       return "file";
     } else if (m == OutputMode::infoLoggerD) {
       return "infoLoggerD";
+    } else if (m == OutputMode::raw) {
+      return "raw";
+    } else if (m == OutputMode::debug) {
+      return "debug";
     } else if (m == OutputMode::none) {
       return "none";
     }
@@ -688,6 +697,12 @@ int InfoLogger::Impl::pushMessage(const InfoLoggerMessageOption& options, const
     puts(buffer);
   }
 
+  // debug output: infoLogger fields one by one
+  if (currentMode.mode == OutputMode::debug) {
+    char buffer[LOG_MAX_SIZE];
+    msgHelper.MessageToText(&msg, buffer, sizeof(buffer), InfoLoggerMessageHelper::Format::Debug);
+    puts(buffer);
+  }
   return 0;
 }
 

src/InfoLoggerMessageHelper.cxx

@@ -13,6 +13,7 @@
 #include <time.h>
 #include <sys/time.h>
 #include <stdio.h>
+#include <string>
 
 #include "InfoLoggerMessageHelper.h"
 #include "InfoLogger/InfoLogger.hxx"
@@ -138,6 +139,7 @@ int InfoLoggerMessageHelper::MessageToText(infoLog_msg_t* msg, char* buffer, int
   int status;
 
   // todo: escape %... & other printf formats ?
+  std::string strBuf;
 
   switch (format) {
 
@@ -240,6 +242,34 @@ int InfoLoggerMessageHelper::MessageToText(infoLog_msg_t* msg, char* buffer, int
       }
       break;
 
+    case InfoLoggerMessageHelper::Format::Debug:
+      // one line per field, fieldName = value
+      for (int i = 0; i < protocols[0].numberOfFields; i++) {
+        if (msg->values[i].isUndefined) {
+          // strBuf += "(undefined)";
+        } else {
+          if (strBuf.length()) {
+            strBuf += ", ";
+          }
+          strBuf += std::string(protocols[0].fields[i].name) + " = ";
+          switch (protocols[0].fields[i].type) {
+            case infoLog_msgField_def_t::ILOG_TYPE_STRING:
+              strBuf += std::string(msg->values[i].value.vString);
+              break;
+            case infoLog_msgField_def_t::ILOG_TYPE_INT:
+              strBuf += std::to_string(msg->values[i].value.vInt);
+              break;
+            case infoLog_msgField_def_t::ILOG_TYPE_DOUBLE:
+              strBuf += std::to_string(msg->values[i].value.vDouble);
+              break;
+            default:
+              break;
+          }
+        }
+      }
+      appendString(buffer, bufferSize, &ix, strBuf.c_str());
+      break;
+
     default:
       return __LINE__;
   }

src/InfoLoggerMessageHelper.h

@@ -38,7 +38,8 @@ class InfoLoggerMessageHelper
   enum Format { Simple,
                 Detailed,
                 Full,
-                Encoded };
+                Encoded,
+                Debug };
   int MessageToText(infoLog_msg_t* msg, char* buffer, int bufferSize, InfoLoggerMessageHelper::Format format);
 
   // indexes to access a given field in msg struct (protocol independent)