Skip to content

Remove obsolete MessageLogger configuration options #31888

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

Merged
cmsbuild merged 4 commits into from
Oct 22, 2020
Merged

Remove obsolete MessageLogger configuration options #31888

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0d7a7fb
Removed obsolete fwkJobReports option from MessageLogger
Dr15Jones Oct 21, 2020
50a4088
FrameworkJobReport as a category needs to be removed
Dr15Jones Oct 21, 2020
2209a87
Removed deprecated messageIDs parameter
Dr15Jones Oct 21, 2020
81b730f
Remove unused FwkJob category from configurations
Dr15Jones Oct 21, 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
2 changes: 0 additions & 2 deletions FWCore/MessageLogger/src/JobReport.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -665,7 +665,6 @@ namespace edm {
msg << " </PerformanceSummary>\n"
<< "</PerformanceReport>\n";
msg << std::flush;
//LogInfo("FwkJob") << msg.str();
}
}

Expand All @@ -687,7 +686,6 @@ namespace edm {
msg << " </PerformanceModule>\n"
<< "</PerformanceReport>\n";
msg << std::flush;
//LogInfo("FwkJob") << msg.str();
}
}

Expand Down
17 changes: 2 additions & 15 deletions FWCore/MessageService/python/MessageLogger_ReleaseValidation_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,23 +34,12 @@
Root_NoDictionary = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
FwkJob = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
FwkSummary = cms.untracked.PSet(
reportEvery = cms.untracked.int32(1),
limit = cms.untracked.int32(10000000)
),
threshold = cms.untracked.string('INFO')
),
FrameworkJobReport = cms.untracked.PSet(
default = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
FwkJob = cms.untracked.PSet(
limit = cms.untracked.int32(10000000)
)
),
suppressWarning = cms.untracked.vstring(),
statistics = cms.untracked.vstring('cerr_stats'),
cerr_stats = cms.untracked.PSet(
Expand All @@ -70,11 +59,9 @@
'cout',
'cerr'),
debugModules = cms.untracked.vstring(),
categories = cms.untracked.vstring('FwkJob',
'FwkReport',
categories = cms.untracked.vstring('FwkReport',
'FwkSummary',
'Root_NoDictionary'),
fwkJobReports = cms.untracked.vstring('FrameworkJobReport')
'Root_NoDictionary')
)


22 changes: 3 additions & 19 deletions FWCore/MessageService/python/MessageLogger_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
),
cerr = cms.untracked.PSet(
optionalPSet = cms.untracked.bool(True),
INFO = cms.untracked.PSet(
INFO = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
noTimeStamps = cms.untracked.bool(False),
Expand All @@ -37,27 +37,13 @@
optionalPSet = cms.untracked.bool(True),
limit = cms.untracked.int32(0)
),
FwkJob = cms.untracked.PSet(
optionalPSet = cms.untracked.bool(True),
limit = cms.untracked.int32(0)
),
FwkSummary = cms.untracked.PSet(
optionalPSet = cms.untracked.bool(True),
reportEvery = cms.untracked.int32(1),
limit = cms.untracked.int32(10000000)
),
threshold = cms.untracked.string('INFO')
),
FrameworkJobReport = cms.untracked.PSet(
optionalPSet = cms.untracked.bool(True),
default = cms.untracked.PSet(
limit = cms.untracked.int32(0)
),
FwkJob = cms.untracked.PSet(
optionalPSet = cms.untracked.bool(True),
limit = cms.untracked.int32(10000000)
)
),
suppressWarning = cms.untracked.vstring(),
statistics = cms.untracked.vstring('cerr_stats'),
cerr_stats = cms.untracked.PSet(
Expand All @@ -80,11 +66,9 @@
'cout',
'cerr'),
debugModules = cms.untracked.vstring(),
categories = cms.untracked.vstring('FwkJob',
'FwkReport',
categories = cms.untracked.vstring('FwkReport',
'FwkSummary',
'Root_NoDictionary'),
fwkJobReports = cms.untracked.vstring('FrameworkJobReport')
'Root_NoDictionary')
)


32 changes: 0 additions & 32 deletions FWCore/MessageService/src/HardwiredDefaults.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ namespace edm {
void MessageLoggerDefaults::hardwireGridJobMode() {
// std::cerr << " ======= hardwireGridJobMode() \n";
destinations.push_back("cerr");
categories.push_back("FwkJob");
categories.push_back("FwkReport");
categories.push_back("FwkSummary");
categories.push_back("Root_NoDictionary");
Expand All @@ -70,24 +69,11 @@ namespace edm {
FwkSummary.limit = 10000000; // int32 limit = 10000000
FwkSummary.reportEvery = 1; // int32 reportEvery = 1
cerr.category["FwkSummary"] = FwkSummary;
Category FwkJob; // PSet FwkJob
FwkJob.limit = 0; // int32 limit = 0
cerr.category["FwkJob"] = FwkJob;
Category Root_NoDictionary; // PSet Root_NoDictionary
Root_NoDictionary.limit = 0; // int32 limit = 0
cerr.category["Root_NoDictionary"] = Root_NoDictionary;
destination["cerr"] = cerr;
}
{
Destination FrameworkJobReport; // PSet FrameworkJobReport
Category default_for_dest; // PSet default
default_for_dest.limit = 0; // int32 limit = 0
FrameworkJobReport.category["default"] = default_for_dest;
Category FwkJob; // PSet FwkJob
FwkJob.limit = 10000000; // int32 limit = 10000000
FrameworkJobReport.category["FwkJob"] = FwkJob;
destination["FrameworkJobReport"] = FrameworkJobReport;
}
{
Destination cerr_stats; // PSet cerr_stats
cerr_stats.threshold = "WARNING"; // string threshold = "WARNING"
Expand All @@ -100,7 +86,6 @@ namespace edm {
void MessageLoggerDefaults::hardwireReleaseValidationJobMode() {
// std::cerr << " ======= hardwireReleaseValidationJobMode() \n";
destinations.push_back("cerr");
categories.push_back("FwkJob");
categories.push_back("FwkReport");
categories.push_back("FwkSummary");
categories.push_back("Root_NoDictionary");
Expand All @@ -125,24 +110,11 @@ namespace edm {
FwkSummary.limit = 10000000; // int32 limit = 10000000
FwkSummary.reportEvery = 1; // int32 reportEvery = 1
cerr.category["FwkSummary"] = FwkSummary;
Category FwkJob; // PSet FwkJob
FwkJob.limit = 0; // int32 limit = 0
cerr.category["FwkJob"] = FwkJob;
Category Root_NoDictionary; // PSet Root_NoDictionary
Root_NoDictionary.limit = 0; // int32 limit = 0
cerr.category["Root_NoDictionary"] = Root_NoDictionary;
destination["cerr"] = cerr;
}
{
Destination FrameworkJobReport; // PSet FrameworkJobReport
Category default_for_dest; // PSet default
default_for_dest.limit = 0; // int32 limit = 0
FrameworkJobReport.category["default"] = default_for_dest;
Category FwkJob; // PSet FwkJob
FwkJob.limit = 10000000; // int32 limit = 10000000
FrameworkJobReport.category["FwkJob"] = FwkJob;
destination["FrameworkJobReport"] = FrameworkJobReport;
}
{
Destination cerr_stats; // PSet cerr_stats
cerr_stats.threshold = "INFO"; // string threshold = "INFO"
Expand All @@ -155,7 +127,6 @@ namespace edm {
void MessageLoggerDefaults::hardwireAnalysisJobMode() {
// std::cerr << " ======= hardwireAnalysisJobMode() \n";
destinations.push_back("warnings");
categories.push_back("FwkJob");
categories.push_back("FwkReport");
categories.push_back("FwkSummary");
categories.push_back("Root_NoDictionary");
Expand All @@ -179,9 +150,6 @@ namespace edm {
Category FwkSummary; // PSet FwkSummary
FwkSummary.limit = 10000000; // int32 limit = 10000000
warnings.category["FwkSummary"] = FwkSummary;
Category FwkJob; // PSet FwkJob
FwkJob.limit = 0; // int32 limit = 0
warnings.category["FwkJob"] = FwkJob;
Category Root_NoDictionary; // PSet Root_NoDictionary
Root_NoDictionary.limit = 0; // int32 limit = 0
warnings.category["Root_NoDictionary"] = Root_NoDictionary;
Expand Down
1 change: 0 additions & 1 deletion FWCore/MessageService/src/MessageLoggerDefaults.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@ namespace edm {

std::vector<std::string> categories;
std::vector<std::string> destinations;
std::vector<std::string> fwkJobReports;
std::vector<std::string> statistics;
std::map<std::string, Destination> destination;

Expand Down
9 changes: 0 additions & 9 deletions FWCore/MessageService/src/MessageLoggerScribe.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,15 +253,6 @@ namespace edm {
// grab list of categories
vString categories = getAparameter<vString>(*job_pset_p, "categories", empty_vString);

// grab list of messageIDs -- these are a synonym for categories
// Note -- the use of messageIDs is deprecated in favor of categories
{
vString messageIDs = getAparameter<vString>(*job_pset_p, "messageIDs", empty_vString);

// combine the lists, not caring about possible duplicates (for now)
copy_all(messageIDs, std::back_inserter(categories));
} // no longer need messageIDs

// grab list of hardwired categories (hardcats) -- these are to be added
// to the list of categories
{
Expand Down
80 changes: 0 additions & 80 deletions FWCore/MessageService/src/MessageServicePSetValidation.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ namespace edm {
destinationPSets(pset);
defaultPSet(pset);
statisticsPSets(pset);
fwkJobReportPSets(pset);
categoryPSets(pset, "MessageLogger");

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

fwkJobReports = check<vString>(pset, "MessageLogger", "fwkJobReports");
noDuplicates(fwkJobReports, "MessageLogger", "fwkJobReports");
noKeywords(fwkJobReports, "MessageLogger", "fwkJobReports");
noNonPSetUsage(pset, fwkJobReports, "MessageLogger", "fwkJobReports");
noDuplicates(fwkJobReports, destinations, "MessageLogger", "fwkJobReports", "destinations");
noDuplicates(fwkJobReports, statistics, "MessageLogger", "fwkJobReports", "statistics");

categories = check<vString>(pset, "MessageLogger", "categories");
noDuplicates(categories, "MessageLogger", "categories");
noKeywords(categories, "MessageLogger", "categories");
noNonPSetUsage(pset, categories, "MessageLogger", "categories");
noDuplicates(categories, destinations, "MessageLogger", "categories", "destinations");
noDuplicates(categories, statistics, "MessageLogger", "categories", "statistics");
noDuplicates(categories, fwkJobReports, "MessageLogger", "categories", "fwkJobReports");

messageIDs = check<vString>(pset, "MessageLogger", "messageIDs");
noDuplicates(messageIDs, "MessageLogger", "messageIDs");
noKeywords(messageIDs, "MessageLogger", "messageIDs");
noNonPSetUsage(pset, messageIDs, "MessageLogger", "messageIDs");
noDuplicates(messageIDs, destinations, "MessageLogger", "messageIDs", "destinations");
noDuplicates(messageIDs, statistics, "MessageLogger", "messageIDs", "statistics");
noDuplicates(messageIDs, fwkJobReports, "MessageLogger", "messageIDs", "fwkJobReports");
noDuplicates(messageIDs, fwkJobReports, "MessageLogger", "messageIDs", "categories");

} // psetLists

Expand Down Expand Up @@ -209,12 +191,8 @@ namespace edm {
return true;
if (s == "destinations")
return true;
if (s == "fwkJobReports")
return true;
if (s == "categories")
return true;
if (s == "messageIDs")
return true;
if (s == "debugModules")
return true;
if (s == "suppressInfo")
Expand Down Expand Up @@ -319,10 +297,6 @@ namespace edm {
return false;
if (word == "categories")
return false;
if (word == "messageIDs")
return false;
if (word == "fwkJobReports")
return false;
if (word == "destinations")
return false;
if (word == "statistics")
Expand Down Expand Up @@ -428,12 +402,8 @@ namespace edm {
continue;
if (lookForMatch(statistics, *i))
continue;
if (lookForMatch(fwkJobReports, *i))
continue;
if (lookForMatch(categories, *i))
continue;
if (lookForMatch(messageIDs, *i))
continue;
if ((*i) == "default")
continue;
ParameterSet empty_PSet;
Expand Down Expand Up @@ -630,54 +600,6 @@ namespace edm {

} // statisticsPSet

void edm::service::MessageServicePSetValidation::fwkJobReportPSets(ParameterSet const& pset) {
ParameterSet empty_PSet;
std::vector<std::string>::const_iterator end = fwkJobReports.end();
for (std::vector<std::string>::const_iterator i = fwkJobReports.begin(); i != end; ++i) {
ParameterSet const& d = pset.getUntrackedParameterSet(*i, empty_PSet);
fwkJobReportPSet(d, *i);
}
} // fwkJobReportPSets

void edm::service::MessageServicePSetValidation::fwkJobReportPSet(ParameterSet const& pset,
std::string const& psetName) {
// Category PSets

categoryPSets(pset, psetName);

// No other PSets -- unless they contain optionalPSet or placeholder=True

noNoncategoryPsets(pset, psetName);

// General parameters

check<bool>(pset, psetName, "placeholder");
std::string s = check<std::string>(pset, "psetName", "filename");
if ((s == "cerr") || (s == "cout")) {
flaws << psetName << " PSet: \n" << s << " is not allowed as a value of filename \n";
}
s = check<std::string>(pset, "psetName", "extension");
if ((s == "cerr") || (s == "cout")) {
flaws << psetName << " PSet: \n" << s << " is not allowed as a value of extension \n";
}
s = check<std::string>(pset, "psetName", "output");

// No other parameters

noneExcept<int>(pset, psetName, "int");

vString okbool;
okbool.push_back("placeholder");
okbool.push_back("optionalPSet");
noneExcept<bool>(pset, psetName, "bool", okbool);
vString okstring;
okstring.push_back("output");
okstring.push_back("filename");
okstring.push_back("extension");
noneExcept<std::string>(pset, psetName, "string", okstring);

} // fwkJobReportPSet

void edm::service::MessageServicePSetValidation::noNoncategoryPsets(ParameterSet const& pset,
std::string const& psetName) {
vString psnames;
Expand All @@ -686,8 +608,6 @@ namespace edm {
for (vString::const_iterator i = psnames.begin(); i != end; ++i) {
if (lookForMatch(categories, *i))
continue;
if (lookForMatch(messageIDs, *i))
continue;
if ((*i) == "default")
continue;
if ((*i) == "ERROR")
Expand Down
4 changes: 0 additions & 4 deletions FWCore/MessageService/src/MessageServicePSetValidation.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,6 @@ namespace edm {
void defaultPSet(ParameterSet const& main_pset);
void statisticsPSets(ParameterSet const& pset);
void statisticsPSet(ParameterSet const& pset, std::string const& psetName);
void fwkJobReportPSets(ParameterSet const& pset);
void fwkJobReportPSet(ParameterSet const& pset, std::string const& psetName);
void categoryPSets(ParameterSet const& pset, std::string const& psetName);
void categoryPSet(ParameterSet const& pset, std::string const& OuterPsetName, std::string const& categoryName);
void catInts(ParameterSet const& pset, std::string const& psetName, std::string const& categoryName);
Expand Down Expand Up @@ -257,9 +255,7 @@ namespace edm {
std::ostringstream flaws;
std::vector<std::string> destinations;
std::vector<std::string> statistics;
std::vector<std::string> fwkJobReports;
std::vector<std::string> categories;
std::vector<std::string> messageIDs;
std::vector<std::string> debugModules;
std::vector<std::string> suppressInfo;
std::vector<std::string> suppressFwkInfo;
Expand Down
9 changes: 0 additions & 9 deletions FWCore/MessageService/src/ThreadSafeLogMessageLoggerScribe.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,15 +234,6 @@ namespace edm {
// grab list of categories
vString categories = getAparameter<vString>(*job_pset_p, "categories", empty_vString);

// grab list of messageIDs -- these are a synonym for categories
// Note -- the use of messageIDs is deprecated in favor of categories
{
vString messageIDs = getAparameter<vString>(*job_pset_p, "messageIDs", empty_vString);

// combine the lists, not caring about possible duplicates (for now)
copy_all(messageIDs, std::back_inserter(categories));
} // no longer need messageIDs

// grab list of hardwired categories (hardcats) -- these are to be added
// to the list of categories -- change log 24
{
Expand Down
Loading