workaround for occControlInstance->getRole() not working. added db log cb

Author: sy-c

src/mainReadout.cxx

@@ -125,6 +125,11 @@ static void signalHandler(int signalId)
 std::string occRole;     // OCC role name
 tRunNumber occRunNumber = 0; // OCC run number
 
+// a general purpose log function for DB
+void dbLog(const std::string &msg) {
+  theLog.log(LogInfoDevel_(3012), "%s", msg.c_str());
+}
+
 class Readout
 {
 
@@ -276,7 +281,6 @@ int Readout::init(int argc, char* argv[])
     cfgDefaults.getOptionalValue<std::string>(cfgDefaultsEntryPoint + ".statsPublishAddress", cfgStatsPublishAddress, cfgStatsPublishAddress);
     cfgDefaults.getOptionalValue<double>(cfgDefaultsEntryPoint + ".statsPublishInterval", cfgStatsPublishInterval, cfgStatsPublishInterval);
     cfgDefaults.getOptionalValue<std::string>(cfgDefaultsEntryPoint + ".db", cfgDatabaseCxParams);
-    cfgDefaults.getOptionalValue<int>(cfgDefaultsEntryPoint + ".dbVerbose", cfgDatabaseVerbose);
   }
   catch(...) {
     //initLogs.push_back({LogWarningSupport_(3100), std::string("Error loading defaults")});
@@ -332,22 +336,6 @@ int Readout::init(int argc, char* argv[])
     initLogs.push_back({LogWarningSupport_(3236), "Failed to start Stats publish"});
   } //otherwise: disabled
 
-  // init database
-  if (cfgDatabaseCxParams != "") {
-    #ifdef WITH_DB
-      try {
-        dbHandle=std::make_unique<ReadoutDatabase>(cfgDatabaseCxParams.c_str());
-	if (dbHandle == nullptr) { throw __LINE__; }
-	dbHandle->verbose = cfgDatabaseVerbose;
-	initLogs.push_back({LogInfoSupport, "Database connected "});
-      }
-      catch(...) {
-        initLogs.push_back({LogWarningSupport_(3242), "Failed to connect database"});
-      }
-    #endif
-  }
-
-
   // configure signal handlers for clean exit
   struct sigaction signalSettings;
   bzero(&signalSettings, sizeof(signalSettings));
@@ -357,8 +345,9 @@ int Readout::init(int argc, char* argv[])
   sigaction(SIGINT, &signalSettings, NULL);
 
   // log startup and options
-  theLog.log(LogInfoSupport_(3001), "Readout " READOUT_VERSION " - process starting, pid %d", getpid());
+  theLog.log(LogInfoSupport_(3001), "Readout " READOUT_VERSION " - process starting, pid %d for role %s", getpid(), occRole.c_str());
   if (cfgVerbose) {
+    theLog.log(LogInfoDevel, "Build time: %s %s", __DATE__, __TIME__);
     theLog.log(LogInfoDevel, "Optional built features enabled:");
     #ifdef WITH_READOUTCARD
       theLog.log(LogInfoDevel, "READOUTCARD : yes");
@@ -408,12 +397,26 @@ int Readout::init(int argc, char* argv[])
       theLog.log(LogInfoDevel, "ZMQ : no");
     #endif
   }
-  
+
   // report cached logs
   for(auto const &l : initLogs) {
     theLog.log(l.first, "%s", l.second.c_str());
   }
 
+  // init database
+  if (cfgDatabaseCxParams != "") {
+    #ifdef WITH_DB
+      try {
+        dbHandle=std::make_unique<ReadoutDatabase>(cfgDatabaseCxParams.c_str(), cfgVerbose, dbLog);
+	if (dbHandle == nullptr) { throw __LINE__; }
+	theLog.log(LogInfoDevel_(3012), "Database connected ");
+      }
+      catch(...) {
+        theLog.log(LogWarningDevel_(3242), "Failed to connect database");
+      }
+    #endif
+  }
+
   return 0;
 }
 
@@ -1334,14 +1337,20 @@ class ReadoutOCCStateMachine : public RuntimeControlledObject
   ReadoutOCCStateMachine(std::unique_ptr<Readout> r) : RuntimeControlledObject("Readout Process")
   {
     theReadout = std::move(r);
-    occRole = this->getRole();
+    // the following does not work: getRole() is empty at this stage - BUG. O2_ROLE is defined.
+    // occRole = this->getRole();
   }
 
   int executeConfigure(const boost::property_tree::ptree& properties)
   {
     if (theReadout == nullptr) {
       return -1;
     }
+
+    if (this->getRole() != occRole) {
+      theLog.log(LogWarningDevel_(3243), "OCC role mismatch: getRole()=%s %s=%s occRole=%s", this->getRole().c_str(), OCC_ROLE_ENV, getenv(OCC_ROLE_ENV), occRole.c_str());
+    }
+
     return theReadout->configure(properties);
   }
 

src/readoutErrorCodes.h

@@ -26,6 +26,7 @@
   { 3009, "Trace for readout data dump", nullptr},
   { 3010, "Trace for readout hardware operations and status", nullptr},
   { 3011, "Trace for readout data stream content", nullptr},
+  { 3012, "Trace for readout database operations", nullptr},
 
   { 3100, "Configuration problem", nullptr},
   { 3101, "A feature is configured but not supported by this readout build.", nullptr},
@@ -47,5 +48,6 @@
   { 3240, "Readout card problem", nullptr},
   { 3241, "Inconsistent data", nullptr},
   { 3242, "Database error", nullptr},
+  { 3243, "Control problem", nullptr},
 */