Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Implement new MessageLogger configuration #32138

Merged
merged 12 commits into from
Nov 19, 2020
Merged

Implement new MessageLogger configuration #32138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
fdaa0f9
Specify use of statistics directly in destinations
Dr15Jones Nov 5, 2020
d9ed82a
Follow CMS member data naming conventions
Dr15Jones Nov 5, 2020
f595d78
Do not hold PSet as member data
Dr15Jones Nov 5, 2020
856130b
Implement new MessageLogger configuration API
Dr15Jones Nov 11, 2020
292b6a2
Fixed formatting
Dr15Jones Nov 12, 2020
f16a78e
Fix new configuration problems
Dr15Jones Nov 12, 2020
0c46ad0
Member data names now conform to CMS standard
Dr15Jones Nov 12, 2020
130c1f4
Correct problems when using new MessageLogger configuration
Dr15Jones Nov 13, 2020
a48efae
Updated MessageLogger tests to use new configuration syntax
Dr15Jones Nov 13, 2020
315a8f9
code-checks update
Dr15Jones Nov 13, 2020
d08b0be
Removed old code based on singleton pattern
Dr15Jones Nov 18, 2020
cbec163
Code improvements based on a code-review
Dr15Jones Nov 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions FWCore/Framework/test/test_deepCall_unscheduled_cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
),
Expand Down
23 changes: 2 additions & 21 deletions FWCore/MessageService/src/ELadministrator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:
//
Expand Down
Loading