Merge pull request #70 from sy-c/master

v2.0.1

Author: sy-c

CMakeLists.txt

@@ -275,7 +275,7 @@ target_link_libraries(
 )
 
 
-# executable: infoLoggerAdminDB
+# executable: o2-infologger-admindb
 add_executable(
         o2-infologger-admindb
         $<TARGET_OBJECTS:objCommonConfiguration>
@@ -420,7 +420,8 @@ target_link_libraries(
 # exclude modules requiring optional dependencies not found
 if(NOT MYSQL_FOUND)
   message("MySQL not found, some infoLogger modules are disabled for this build")
-  set_target_properties(infoLoggerAdminDB PROPERTIES EXCLUDE_FROM_ALL 1)
+  set_target_properties(o2-infologger-admindb PROPERTIES EXCLUDE_FROM_ALL 1)
+  set_target_properties(o2-infologger-test-db PROPERTIES EXCLUDE_FROM_ALL 1)
 endif()
 
 

doc/README.md

@@ -182,7 +182,7 @@ The InfoLogger library allows to inject messages directly from programs, as show
  
  * When using the C++ API, it is recommended to use the macros defined in InfoLoggerMacros.hxx to have the full context defined (severity, level, errno, source file/line) for each message in a compact way.
  
- * Some example calls are available in [the source code](/test/testInfoLogger.cxx)
+ * Some example calls are available in the source code: [1](/example/exampleLog.cxx) [2](/test/testInfoLogger.cxx)
  
  * There is the possibility to easily redirect FairLogger messages (see InfoLoggerFMQ.hxx) and process stdout/stderr to infologger (see InfoLogger.hxx setStandardRedirection())
    without changing the code from where they are issued. Although practical to get all output in InfoLogger, the messages captured this way are injected with a reduced number of tags,

doc/releaseNotes.md

@@ -91,3 +91,6 @@ This file describes the main feature changes for each InfoLogger released versio
 ## v2.0.0 - 06/04/2021
 - doxygen doc cleanup
 - Adapted to follow o2-flp conventions: renaming of executables, libraries, services, paths.
+
+## v2.0.1 - 05/05/2021
+- fix reconnect timeout in stdout fallback mode (now 5s).

example/CMakeLists.txt

@@ -2,6 +2,9 @@
 # typical command:
 # cmake -DInfoLogger_DIR=path/to/infologger/lib/cmake/InfoLogger  .. 
 
+project (InfoLoggerExample)
+cmake_minimum_required(VERSION 3.17)
+
 find_package(InfoLogger REQUIRED)
 set(CMAKE_CXX_STANDARD 14)
 add_executable(exampleLog exampleLog.cxx)

example/exampleLog.cxx

@@ -9,11 +9,32 @@
 // or submit itself to any jurisdiction.
 
 #include <InfoLogger/InfoLogger.hxx>
+
+// optionnaly, use the helper macros
+#include <InfoLogger/InfoLoggerMacros.hxx>
+      
 using namespace AliceO2::InfoLogger;
 int main()
 {
+  // create handle to infologger system
   InfoLogger theLog;
 
+  // or, alternatively, to start infologger library in debug mode on stdout
+  // (can also be done at runtime by setting environment O2_INFOLOGGER_MODE)
+  // outputMode can be one of stdout, debug, infoLoggerD, ...
+  // InfoLogger theLog("outputMode=debug");
+
+  // optionnaly, customize some of the "static" fields
+  // to be applied to all messages
+  InfoLoggerContext theLogContext;
+  theLogContext.setField(InfoLoggerContext::FieldName::Facility, "myTestFacility");
+  theLog.setContext(theLogContext);
+
+  // log a message
   theLog.log("infoLogger message test");
+    
+  // log a warning with code 1234 for developers
+  theLog.log(LogWarningDevel_(1234), "this is a test warning message");
+  
   return 0;
 }

src/InfoLoggerClient.cxx

@@ -283,7 +283,7 @@ void InfoLoggerClient::reconnect() {
         } else {
           if (isVerbose) log.info("reconnect failed");
         }
-        reconnectTimer.reset(cfg.reconnectTimeout);
+        reconnectTimer.reset(cfg.reconnectTimeout*1000000.0);
       }
     }
     usleep(200000);