Merge pull request #32138 from Dr15Jones/newMessageLoggerConfig

Implement new MessageLogger configuration
cms-sw · Nov 19, 2020 · 4489420 · 4489420
2 parents 5436926 + cbec163
commit 4489420
Show file tree

Hide file tree

Showing 63 changed files with 1,924 additions and 1,473 deletions.
diff --git a/FWCore/Framework/test/test_deepCall_unscheduled_cfg.py b/FWCore/Framework/test/test_deepCall_unscheduled_cfg.py
@@ -23,13 +23,11 @@
 )
 
 process.MessageLogger = cms.Service("MessageLogger",
-    destinations   = cms.untracked.vstring('cout',
-                                           'cerr'
-    ),
-    categories = cms.untracked.vstring(
-        'Tracer'
+    cerr = cms.untracked.PSet(
+      enableStatistics = cms.untracked.bool(False)
     ),
     cout = cms.untracked.PSet(
+        enable = cms.untracked.bool(True),
         default = cms.untracked.PSet (
             limit = cms.untracked.int32(0)
         ),

diff --git a/FWCore/MessageService/src/ELadministrator.h b/FWCore/MessageService/src/ELadministrator.h
@@ -59,27 +59,13 @@
 namespace edm {
   namespace service {
 
-    // ----------------------------------------------------------------------
-    // Prerequisite classes:
-    // ----------------------------------------------------------------------
-
-    class ELdestination;
-    class ELcout;
-    class MessageLoggerScribe;
-
     // ----------------------------------------------------------------------
     // ELadministrator:
     // ----------------------------------------------------------------------
 
-    class ELadministrator {  // *** Destructable Singleton Pattern ***
-
-      friend class MessageLoggerScribe;               // proper ELadministrator cleanup
-      friend class ThreadSafeLogMessageLoggerScribe;  // proper ELadministrator cleanup
-      friend class ELcout;                            // ELcout behavior
-
-      // *** Error Logger Functionality ***
-
+    class ELadministrator {
     public:
+      ELadministrator();
       ~ELadministrator();
 
       //Replaces ErrorLog which is no longer needed
@@ -118,11 +104,6 @@ namespace edm {
       const ELseverityLevel& highSeverity() const;
       int severityCounts(int lev) const;
 
-    protected:
-      // ---  traditional birth/death, but disallowed to users:
-      //
-      ELadministrator();
-
     private:
       // ---  traditional member data:
       //