Merge pull request #38728 from Dr15Jones/fixMessageLoggerIDCollision

Avoid ID collisions between ED and ES modules in MessageLogger
cms-sw · Jul 14, 2022 · 857137d · 857137d
2 parents cb2ed7f + 731f637
commit 857137d
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/FWCore/MessageService/plugins/MessageLogger.cc b/FWCore/MessageService/plugins/MessageLogger.cc
@@ -764,7 +764,8 @@ namespace edm {
       if (label->empty() or (*label)[0] == '\0') {
         label = &desc->type_;
       }
-      messageDrop->setModuleWithPhase(desc->type_, *label, desc->id_, "@callESModule");
+      //make sure ES module IDs do not conflict with ED module IDs
+      messageDrop->setModuleWithPhase(desc->type_, *label, 1000000 + desc->id_, "@callESModule");
     }
     void MessageLogger::postESModule(eventsetup::EventSetupRecordKey const&, ESModuleCallingContext const&) {
       MessageDrop* messageDrop = MessageDrop::instance();