Merge pull request #269 from DUNE-DAQ/mroda/get_info_protections

Protect from disasters while gather_stats
DUNE-DAQ · Feb 8, 2024 · b83b350 · b83b350
2 parents ebbfd26 + 6faeffc
commit b83b350
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 4 deletions.
diff --git a/src/DAQModuleManager.hpp b/src/DAQModuleManager.hpp
@@ -47,6 +47,20 @@ ERS_DECLARE_ISSUE(appfwk,
                   ((std::string)cmdid)                                                   ///< Message parameters
                   ((std::string)modules)                                                 ///< Message parameters
 )
+
+ERS_DECLARE_ISSUE(appfwk,                                                                ///< Namespace
+                  FailedInfoGathering,                                                   ///< Issue class name
+                  "Info gathering failed for module: " << module,                        ///< Message
+                  ((std::string)module)                                                  ///< Message parameters
+)
+
+ERS_DECLARE_ISSUE_BASE(appfwk,                                                           ///< Namespace  
+		       ExceptionWhileInfoGathering,                                      ///< Issue class name
+		       FailedInfoGathering,                                              ///< Base Issue class name
+		       module << " threw exception while info gathering: " << message,   ///< Message
+		       ((std::string)module),                                            ///< Base Issue params
+		       ((std::string)message)                                            ///< This class params
+)
 // Re-enable coverage collection LCOV_EXCL_STOP
 
 namespace appfwk {

diff --git a/src/detail/DAQModuleManager.hxx b/src/detail/DAQModuleManager.hxx
@@ -224,10 +224,21 @@ DAQModuleManager::gather_stats(opmonlib::InfoCollector& ci, int level)
   iomanager::NetworkManager::get().gather_stats(ci, level);
 
   for (const auto& [mod_name, mod_ptr] : m_module_map) {
-    opmonlib::InfoCollector tmp_ci;
-    mod_ptr->get_info(tmp_ci, level);
-    if (!tmp_ci.is_empty()) {
-      ci.add(mod_name, tmp_ci);
+    try {
+      opmonlib::InfoCollector tmp_ci;
+      mod_ptr->get_info(tmp_ci, level);
+      if (!tmp_ci.is_empty()) {
+	ci.add(mod_name, tmp_ci);
+      }
+    }
+    catch( ers::Issue & i ) {
+      ers::warning( FailedInfoGathering(ERS_HERE, mod_name, i) );
+    }
+    catch( std::exception & ex ) {
+      ers::warning( ExceptionWhileInfoGathering(ERS_HERE, mod_name, ex.what()) );
+    }
+    catch( ... ) {
+      ers::warning( FailedInfoGathering(ERS_HERE, mod_name) );
     }
   }
 }