Skip to content

Commit ed303b7

Browse files
cmsbuildcmsbuild
authored
Merge pull request cms-sw#31888 from Dr15Jones/cleanupMessageLogger
Remove obsolete MessageLogger configuration options
2 parents bbf5838 + 81b730f commit ed303b7

10 files changed

+7
-174
lines changed

‎FWCore/MessageLogger/src/JobReport.cc‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -665,7 +665,6 @@ namespace edm {
665665
msg << " </PerformanceSummary>\n"
666666
<< "</PerformanceReport>\n";
667667
msg << std::flush;
668-
//LogInfo("FwkJob") << msg.str();
669668
}
670669
}
671670

@@ -687,7 +686,6 @@ namespace edm {
687686
msg << " </PerformanceModule>\n"
688687
<< "</PerformanceReport>\n";
689688
msg << std::flush;
690-
//LogInfo("FwkJob") << msg.str();
691689
}
692690
}
693691

‎FWCore/MessageService/python/MessageLogger_ReleaseValidation_cfi.py‎

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -34,23 +34,12 @@
3434
Root_NoDictionary = cms.untracked.PSet(
3535
limit = cms.untracked.int32(0)
3636
),
37-
FwkJob = cms.untracked.PSet(
38-
limit = cms.untracked.int32(0)
39-
),
4037
FwkSummary = cms.untracked.PSet(
4138
reportEvery = cms.untracked.int32(1),
4239
limit = cms.untracked.int32(10000000)
4340
),
4441
threshold = cms.untracked.string('INFO')
4542
),
46-
FrameworkJobReport = cms.untracked.PSet(
47-
default = cms.untracked.PSet(
48-
limit = cms.untracked.int32(0)
49-
),
50-
FwkJob = cms.untracked.PSet(
51-
limit = cms.untracked.int32(10000000)
52-
)
53-
),
5443
suppressWarning = cms.untracked.vstring(),
5544
statistics = cms.untracked.vstring('cerr_stats'),
5645
cerr_stats = cms.untracked.PSet(
@@ -70,11 +59,9 @@
7059
'cout',
7160
'cerr'),
7261
debugModules = cms.untracked.vstring(),
73-
categories = cms.untracked.vstring('FwkJob',
74-
'FwkReport',
62+
categories = cms.untracked.vstring('FwkReport',
7563
'FwkSummary',
76-
'Root_NoDictionary'),
77-
fwkJobReports = cms.untracked.vstring('FrameworkJobReport')
64+
'Root_NoDictionary')
7865
)
7966

8067

‎FWCore/MessageService/python/MessageLogger_cfi.py‎

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
),
2222
cerr = cms.untracked.PSet(
2323
optionalPSet = cms.untracked.bool(True),
24-
INFO = cms.untracked.PSet(
24+
INFO = cms.untracked.PSet(
2525
limit = cms.untracked.int32(0)
2626
),
2727
noTimeStamps = cms.untracked.bool(False),
@@ -37,27 +37,13 @@
3737
optionalPSet = cms.untracked.bool(True),
3838
limit = cms.untracked.int32(0)
3939
),
40-
FwkJob = cms.untracked.PSet(
41-
optionalPSet = cms.untracked.bool(True),
42-
limit = cms.untracked.int32(0)
43-
),
4440
FwkSummary = cms.untracked.PSet(
4541
optionalPSet = cms.untracked.bool(True),
4642
reportEvery = cms.untracked.int32(1),
4743
limit = cms.untracked.int32(10000000)
4844
),
4945
threshold = cms.untracked.string('INFO')
5046
),
51-
FrameworkJobReport = cms.untracked.PSet(
52-
optionalPSet = cms.untracked.bool(True),
53-
default = cms.untracked.PSet(
54-
limit = cms.untracked.int32(0)
55-
),
56-
FwkJob = cms.untracked.PSet(
57-
optionalPSet = cms.untracked.bool(True),
58-
limit = cms.untracked.int32(10000000)
59-
)
60-
),
6147
suppressWarning = cms.untracked.vstring(),
6248
statistics = cms.untracked.vstring('cerr_stats'),
6349
cerr_stats = cms.untracked.PSet(
@@ -80,11 +66,9 @@
8066
'cout',
8167
'cerr'),
8268
debugModules = cms.untracked.vstring(),
83-
categories = cms.untracked.vstring('FwkJob',
84-
'FwkReport',
69+
categories = cms.untracked.vstring('FwkReport',
8570
'FwkSummary',
86-
'Root_NoDictionary'),
87-
fwkJobReports = cms.untracked.vstring('FrameworkJobReport')
71+
'Root_NoDictionary')
8872
)
8973

9074

‎FWCore/MessageService/src/HardwiredDefaults.cc‎

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ namespace edm {
4545
void MessageLoggerDefaults::hardwireGridJobMode() {
4646
// std::cerr << " ======= hardwireGridJobMode() \n";
4747
destinations.push_back("cerr");
48-
categories.push_back("FwkJob");
4948
categories.push_back("FwkReport");
5049
categories.push_back("FwkSummary");
5150
categories.push_back("Root_NoDictionary");
@@ -70,24 +69,11 @@ namespace edm {
7069
FwkSummary.limit = 10000000; // int32 limit = 10000000
7170
FwkSummary.reportEvery = 1; // int32 reportEvery = 1
7271
cerr.category["FwkSummary"] = FwkSummary;
73-
Category FwkJob; // PSet FwkJob
74-
FwkJob.limit = 0; // int32 limit = 0
75-
cerr.category["FwkJob"] = FwkJob;
7672
Category Root_NoDictionary; // PSet Root_NoDictionary
7773
Root_NoDictionary.limit = 0; // int32 limit = 0
7874
cerr.category["Root_NoDictionary"] = Root_NoDictionary;
7975
destination["cerr"] = cerr;
8076
}
81-
{
82-
Destination FrameworkJobReport; // PSet FrameworkJobReport
83-
Category default_for_dest; // PSet default
84-
default_for_dest.limit = 0; // int32 limit = 0
85-
FrameworkJobReport.category["default"] = default_for_dest;
86-
Category FwkJob; // PSet FwkJob
87-
FwkJob.limit = 10000000; // int32 limit = 10000000
88-
FrameworkJobReport.category["FwkJob"] = FwkJob;
89-
destination["FrameworkJobReport"] = FrameworkJobReport;
90-
}
9177
{
9278
Destination cerr_stats; // PSet cerr_stats
9379
cerr_stats.threshold = "WARNING"; // string threshold = "WARNING"
@@ -100,7 +86,6 @@ namespace edm {
10086
void MessageLoggerDefaults::hardwireReleaseValidationJobMode() {
10187
// std::cerr << " ======= hardwireReleaseValidationJobMode() \n";
10288
destinations.push_back("cerr");
103-
categories.push_back("FwkJob");
10489
categories.push_back("FwkReport");
10590
categories.push_back("FwkSummary");
10691
categories.push_back("Root_NoDictionary");
@@ -125,24 +110,11 @@ namespace edm {
125110
FwkSummary.limit = 10000000; // int32 limit = 10000000
126111
FwkSummary.reportEvery = 1; // int32 reportEvery = 1
127112
cerr.category["FwkSummary"] = FwkSummary;
128-
Category FwkJob; // PSet FwkJob
129-
FwkJob.limit = 0; // int32 limit = 0
130-
cerr.category["FwkJob"] = FwkJob;
131113
Category Root_NoDictionary; // PSet Root_NoDictionary
132114
Root_NoDictionary.limit = 0; // int32 limit = 0
133115
cerr.category["Root_NoDictionary"] = Root_NoDictionary;
134116
destination["cerr"] = cerr;
135117
}
136-
{
137-
Destination FrameworkJobReport; // PSet FrameworkJobReport
138-
Category default_for_dest; // PSet default
139-
default_for_dest.limit = 0; // int32 limit = 0
140-
FrameworkJobReport.category["default"] = default_for_dest;
141-
Category FwkJob; // PSet FwkJob
142-
FwkJob.limit = 10000000; // int32 limit = 10000000
143-
FrameworkJobReport.category["FwkJob"] = FwkJob;
144-
destination["FrameworkJobReport"] = FrameworkJobReport;
145-
}
146118
{
147119
Destination cerr_stats; // PSet cerr_stats
148120
cerr_stats.threshold = "INFO"; // string threshold = "INFO"
@@ -155,7 +127,6 @@ namespace edm {
155127
void MessageLoggerDefaults::hardwireAnalysisJobMode() {
156128
// std::cerr << " ======= hardwireAnalysisJobMode() \n";
157129
destinations.push_back("warnings");
158-
categories.push_back("FwkJob");
159130
categories.push_back("FwkReport");
160131
categories.push_back("FwkSummary");
161132
categories.push_back("Root_NoDictionary");
@@ -179,9 +150,6 @@ namespace edm {
179150
Category FwkSummary; // PSet FwkSummary
180151
FwkSummary.limit = 10000000; // int32 limit = 10000000
181152
warnings.category["FwkSummary"] = FwkSummary;
182-
Category FwkJob; // PSet FwkJob
183-
FwkJob.limit = 0; // int32 limit = 0
184-
warnings.category["FwkJob"] = FwkJob;
185153
Category Root_NoDictionary; // PSet Root_NoDictionary
186154
Root_NoDictionary.limit = 0; // int32 limit = 0
187155
warnings.category["Root_NoDictionary"] = Root_NoDictionary;

‎FWCore/MessageService/src/MessageLoggerDefaults.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@ namespace edm {
8989

9090
std::vector<std::string> categories;
9191
std::vector<std::string> destinations;
92-
std::vector<std::string> fwkJobReports;
9392
std::vector<std::string> statistics;
9493
std::map<std::string, Destination> destination;
9594

‎FWCore/MessageService/src/MessageLoggerScribe.cc‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -253,15 +253,6 @@ namespace edm {
253253
// grab list of categories
254254
vString categories = getAparameter<vString>(*job_pset_p, "categories", empty_vString);
255255

256-
// grab list of messageIDs -- these are a synonym for categories
257-
// Note -- the use of messageIDs is deprecated in favor of categories
258-
{
259-
vString messageIDs = getAparameter<vString>(*job_pset_p, "messageIDs", empty_vString);
260-
261-
// combine the lists, not caring about possible duplicates (for now)
262-
copy_all(messageIDs, std::back_inserter(categories));
263-
} // no longer need messageIDs
264-
265256
// grab list of hardwired categories (hardcats) -- these are to be added
266257
// to the list of categories
267258
{

‎FWCore/MessageService/src/MessageServicePSetValidation.cc‎

Lines changed: 0 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ namespace edm {
6363
destinationPSets(pset);
6464
defaultPSet(pset);
6565
statisticsPSets(pset);
66-
fwkJobReportPSets(pset);
6766
categoryPSets(pset, "MessageLogger");
6867

6968
// No other PSets -- unless they contain optionalPSet or placeholder=True
@@ -104,29 +103,12 @@ namespace edm {
104103
noKeywords(statistics, "MessageLogger", "statistics");
105104
noNonPSetUsage(pset, statistics, "MessageLogger", "statistics");
106105

107-
fwkJobReports = check<vString>(pset, "MessageLogger", "fwkJobReports");
108-
noDuplicates(fwkJobReports, "MessageLogger", "fwkJobReports");
109-
noKeywords(fwkJobReports, "MessageLogger", "fwkJobReports");
110-
noNonPSetUsage(pset, fwkJobReports, "MessageLogger", "fwkJobReports");
111-
noDuplicates(fwkJobReports, destinations, "MessageLogger", "fwkJobReports", "destinations");
112-
noDuplicates(fwkJobReports, statistics, "MessageLogger", "fwkJobReports", "statistics");
113-
114106
categories = check<vString>(pset, "MessageLogger", "categories");
115107
noDuplicates(categories, "MessageLogger", "categories");
116108
noKeywords(categories, "MessageLogger", "categories");
117109
noNonPSetUsage(pset, categories, "MessageLogger", "categories");
118110
noDuplicates(categories, destinations, "MessageLogger", "categories", "destinations");
119111
noDuplicates(categories, statistics, "MessageLogger", "categories", "statistics");
120-
noDuplicates(categories, fwkJobReports, "MessageLogger", "categories", "fwkJobReports");
121-
122-
messageIDs = check<vString>(pset, "MessageLogger", "messageIDs");
123-
noDuplicates(messageIDs, "MessageLogger", "messageIDs");
124-
noKeywords(messageIDs, "MessageLogger", "messageIDs");
125-
noNonPSetUsage(pset, messageIDs, "MessageLogger", "messageIDs");
126-
noDuplicates(messageIDs, destinations, "MessageLogger", "messageIDs", "destinations");
127-
noDuplicates(messageIDs, statistics, "MessageLogger", "messageIDs", "statistics");
128-
noDuplicates(messageIDs, fwkJobReports, "MessageLogger", "messageIDs", "fwkJobReports");
129-
noDuplicates(messageIDs, fwkJobReports, "MessageLogger", "messageIDs", "categories");
130112

131113
} // psetLists
132114

@@ -209,12 +191,8 @@ namespace edm {
209191
return true;
210192
if (s == "destinations")
211193
return true;
212-
if (s == "fwkJobReports")
213-
return true;
214194
if (s == "categories")
215195
return true;
216-
if (s == "messageIDs")
217-
return true;
218196
if (s == "debugModules")
219197
return true;
220198
if (s == "suppressInfo")
@@ -319,10 +297,6 @@ namespace edm {
319297
return false;
320298
if (word == "categories")
321299
return false;
322-
if (word == "messageIDs")
323-
return false;
324-
if (word == "fwkJobReports")
325-
return false;
326300
if (word == "destinations")
327301
return false;
328302
if (word == "statistics")
@@ -428,12 +402,8 @@ namespace edm {
428402
continue;
429403
if (lookForMatch(statistics, *i))
430404
continue;
431-
if (lookForMatch(fwkJobReports, *i))
432-
continue;
433405
if (lookForMatch(categories, *i))
434406
continue;
435-
if (lookForMatch(messageIDs, *i))
436-
continue;
437407
if ((*i) == "default")
438408
continue;
439409
ParameterSet empty_PSet;
@@ -630,54 +600,6 @@ namespace edm {
630600

631601
} // statisticsPSet
632602

633-
void edm::service::MessageServicePSetValidation::fwkJobReportPSets(ParameterSet const& pset) {
634-
ParameterSet empty_PSet;
635-
std::vector<std::string>::const_iterator end = fwkJobReports.end();
636-
for (std::vector<std::string>::const_iterator i = fwkJobReports.begin(); i != end; ++i) {
637-
ParameterSet const& d = pset.getUntrackedParameterSet(*i, empty_PSet);
638-
fwkJobReportPSet(d, *i);
639-
}
640-
} // fwkJobReportPSets
641-
642-
void edm::service::MessageServicePSetValidation::fwkJobReportPSet(ParameterSet const& pset,
643-
std::string const& psetName) {
644-
// Category PSets
645-
646-
categoryPSets(pset, psetName);
647-
648-
// No other PSets -- unless they contain optionalPSet or placeholder=True
649-
650-
noNoncategoryPsets(pset, psetName);
651-
652-
// General parameters
653-
654-
check<bool>(pset, psetName, "placeholder");
655-
std::string s = check<std::string>(pset, "psetName", "filename");
656-
if ((s == "cerr") || (s == "cout")) {
657-
flaws << psetName << " PSet: \n" << s << " is not allowed as a value of filename \n";
658-
}
659-
s = check<std::string>(pset, "psetName", "extension");
660-
if ((s == "cerr") || (s == "cout")) {
661-
flaws << psetName << " PSet: \n" << s << " is not allowed as a value of extension \n";
662-
}
663-
s = check<std::string>(pset, "psetName", "output");
664-
665-
// No other parameters
666-
667-
noneExcept<int>(pset, psetName, "int");
668-
669-
vString okbool;
670-
okbool.push_back("placeholder");
671-
okbool.push_back("optionalPSet");
672-
noneExcept<bool>(pset, psetName, "bool", okbool);
673-
vString okstring;
674-
okstring.push_back("output");
675-
okstring.push_back("filename");
676-
okstring.push_back("extension");
677-
noneExcept<std::string>(pset, psetName, "string", okstring);
678-
679-
} // fwkJobReportPSet
680-
681603
void edm::service::MessageServicePSetValidation::noNoncategoryPsets(ParameterSet const& pset,
682604
std::string const& psetName) {
683605
vString psnames;
@@ -686,8 +608,6 @@ namespace edm {
686608
for (vString::const_iterator i = psnames.begin(); i != end; ++i) {
687609
if (lookForMatch(categories, *i))
688610
continue;
689-
if (lookForMatch(messageIDs, *i))
690-
continue;
691611
if ((*i) == "default")
692612
continue;
693613
if ((*i) == "ERROR")

‎FWCore/MessageService/src/MessageServicePSetValidation.h‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,6 @@ namespace edm {
8181
void defaultPSet(ParameterSet const& main_pset);
8282
void statisticsPSets(ParameterSet const& pset);
8383
void statisticsPSet(ParameterSet const& pset, std::string const& psetName);
84-
void fwkJobReportPSets(ParameterSet const& pset);
85-
void fwkJobReportPSet(ParameterSet const& pset, std::string const& psetName);
8684
void categoryPSets(ParameterSet const& pset, std::string const& psetName);
8785
void categoryPSet(ParameterSet const& pset, std::string const& OuterPsetName, std::string const& categoryName);
8886
void catInts(ParameterSet const& pset, std::string const& psetName, std::string const& categoryName);
@@ -257,9 +255,7 @@ namespace edm {
257255
std::ostringstream flaws;
258256
std::vector<std::string> destinations;
259257
std::vector<std::string> statistics;
260-
std::vector<std::string> fwkJobReports;
261258
std::vector<std::string> categories;
262-
std::vector<std::string> messageIDs;
263259
std::vector<std::string> debugModules;
264260
std::vector<std::string> suppressInfo;
265261
std::vector<std::string> suppressFwkInfo;

‎FWCore/MessageService/src/ThreadSafeLogMessageLoggerScribe.cc‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -234,15 +234,6 @@ namespace edm {
234234
// grab list of categories
235235
vString categories = getAparameter<vString>(*job_pset_p, "categories", empty_vString);
236236

237-
// grab list of messageIDs -- these are a synonym for categories
238-
// Note -- the use of messageIDs is deprecated in favor of categories
239-
{
240-
vString messageIDs = getAparameter<vString>(*job_pset_p, "messageIDs", empty_vString);
241-
242-
// combine the lists, not caring about possible duplicates (for now)
243-
copy_all(messageIDs, std::back_inserter(categories));
244-
} // no longer need messageIDs
245-
246237
// grab list of hardwired categories (hardcats) -- these are to be added
247238
// to the list of categories -- change log 24
248239
{

0 commit comments

Comments
 (0)