Commit f91e9850 authored by Steven Murray's avatar Steven Murray
Browse files

Renamed cta-taped configuration param LogLevel to LogMask

parent 8616c572
......@@ -111,10 +111,10 @@ static int exceptionThrowingMain(
TapedConfiguration::createFromCtaConf(commandLine.configFileLocation, log);
// Adjust log mask to the log level potentionally set in the configuration file
log.setLogMask(globalConfig.logLevel.value());
log.setLogMask(globalConfig.logMask.value());
{
std::list<cta::log::Param> params = {cta::log::Param("logLevel", globalConfig.logLevel.value())};
log(log::INFO, "Set log level", params);
std::list<cta::log::Param> params = {cta::log::Param("logMask", globalConfig.logMask.value())};
log(log::INFO, "Set log mask", params);
}
// Create the object providing utilities for working with UNIX capabilities
......
......@@ -38,7 +38,7 @@ TapedConfiguration TapedConfiguration::createFromCtaConf(
ConfigurationFile cf(generalConfigPath);
// Extract configuration from parsed config file
// TpConfig
ret.logLevel.setFromConfigurationFile(cf, generalConfigPath);
ret.logMask.setFromConfigurationFile(cf, generalConfigPath);
ret.tpConfigPath.setFromConfigurationFile(cf, generalConfigPath);
// Memory management
ret.bufferSize.setFromConfigurationFile(cf, generalConfigPath);
......@@ -61,7 +61,7 @@ TapedConfiguration TapedConfiguration::createFromCtaConf(
ret.driveConfigs = Tpconfig::parseFile(ret.tpConfigPath.value());
// If we get here, the configuration file is good enough to be logged.
ret.logLevel.log(log);
ret.logMask.log(log);
ret.tpConfigPath.log(log);
ret.bufferSize.log(log);
......
......@@ -46,9 +46,9 @@ struct TapedConfiguration {
//----------------------------------------------------------------------------
// Basics: tp config
//----------------------------------------------------------------------------
/// Log level
SourcedParameter<std::string> logLevel = decltype(logLevel)
("taped", "LogLevel", "DEBUG", "Compile time default");
/// The log mask. Logs with a level lower than this value will be masked.
SourcedParameter<std::string> logMask = decltype(logMask)
("taped", "LogMask", "DEBUG", "Compile time default");
/// Path to the file describing the tape drives (TPCONFIG)
SourcedParameter<std::string> tpConfigPath = decltype(tpConfigPath)
("taped" , "TpConfigPath", "/etc/cta/TPCONFIG", "Compile time default");
......
......@@ -20,8 +20,7 @@
#
################################################################################
# The log level to be used when logging
#
# The log mask. Logs with a level lower than this value will be masked.
# Possible values are:
# EMERG
# ALERT
......@@ -34,6 +33,6 @@
# USERERR
#
# Please note that the USERERR log level is equivalent to NOTICE because it is
# a convention of CTA to use log level NOTICE to label user errors
# a convention of CTA to use log level NOTICE to label user errors.
#
# taped LogLevel INFO
# taped LogMask INFO
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment