Merge pull request #64 from sy-c/master

infologger_options

Author: sy-c

doc/README.md

@@ -279,6 +279,7 @@ achieved on CentOS 7 with e.g. (as root):
    - outputMode: the main output mode of the library. As accepted by INFOLOGGER_MODE. Default: infoLoggerD.
    - outputModeFallback: the fallback output mode of the library. As accepted by INFOLOGGER_MODE. Default: stdout. The fallback mode is selected on initialization only (not later at runtime), if the main mode fails on first attempt.
    - verbose: 0 or 1. Default: 0. If 1, extra information is printed on stdout, e.g. to report the selected output.
+   - floodProtection: 0 or 1. Default: 1. Enable(1)/disable(0) the message flood protection.
 
 
 

doc/releaseNotes.md

@@ -86,3 +86,4 @@ This file describes the main feature changes for each InfoLogger released versio
 
 ## 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.
+- added INFOLOGGER_OPTIONS environment variable, which allows overriding some of the built-in client defaults: outputMode, outputModeFallback, verbose, floodProtection.

src/InfoLogger.cxx

@@ -199,15 +199,18 @@ class InfoLogger::Impl
         throw __LINE__;
       }
       for (auto& it : kv) {
+        //printf("%s = %s\n",it.first.c_str(), it.second.c_str());
         if (it.first == "outputMode") {
           getOutputStreamFromString(it.second.c_str(), mainMode);
         } else if (it.first == "outputModeFallback") {
           getOutputStreamFromString(it.second.c_str(), fallbackMode);
         } else if (it.first == "verbose") {
           verbose = atoi(it.second.c_str());
-        } else {
+        } else if (it.first == "floodProtection") {
+	  flood_protection = atoi(it.second.c_str());
+	} else {
           // unknown option
-          // printf("Unknown option %s\n",it.second.c_str());
+          printf("Unknown infoLogger option %s\n",it.first.c_str());
           throw __LINE__;
         }
       }
@@ -241,6 +244,9 @@ class InfoLogger::Impl
       }
       if (verbose) {
         printf("Using output mode %s\n", getStringFromMode(currentMode.mode));
+	if (!flood_protection) {
+          printf("Flood protection disabled\n");
+	}
       }
 
       if (currentMode.mode == OutputMode::file) {
@@ -410,7 +416,7 @@ class InfoLogger::Impl
 
   // message flood prevention
   // constants
-  const bool flood_protection = 1;         // if set, flood protection mechanism enabled
+  bool flood_protection = 1;         // if set, flood protection mechanism enabled
   const unsigned int flood_maxmsg_sec=500; // maximum messages in one second to trigger flood
   const unsigned int flood_maxmsg_min=1000; // maximum messages in one minute to trigger flood
   const unsigned int flood_maxmsg_file=1000; // maximum number of messages in overflow log file

src/log.cxx

@@ -202,12 +202,20 @@ int main(int argc, char** argv)
     }
   }
 
-  InfoLogger theLog;
+  std::unique_ptr<InfoLogger> theLog;
+  try {
+    theLog=std::make_unique<InfoLogger>();
+  }
+  catch(int err) {
+    printf("Failed to initialize infoLogger: exception %d\n",err);
+    return -1;
+  }
+  
 
   // additionnal args = messages to send
   int i;
   for (i = optind; i < argc; i++) {
-    theLog.log(msgOptions, msgContext, "%s", argv[i]);
+    theLog->log(msgOptions, msgContext, "%s", argv[i]);
   }
 
   // todo: catch exceptions
@@ -227,7 +235,7 @@ int main(int argc, char** argv)
           break;
         }
         //infoLogger_msg_xt(UNDEFINED_STRING,UNDEFINED_INT,UNDEFINED_INT,facility,severity,level,msg);
-        theLog.log(msgOptions, msgContext, "%s", msg.c_str());
+        theLog->log(msgOptions, msgContext, "%s", msg.c_str());
       }
       if (eof)
         break;