Rename SetSeverity to SetSeverityFromString and check for valid severity
This commit is contained in:
parent
9646a5fbc3
commit
ef5cdf1725
3 changed files with 7 additions and 4 deletions
|
|
@ -43,8 +43,8 @@ Daemon::Daemon()
|
||||||
Log().Init(anbox::Logger::Severity::kWarning);
|
Log().Init(anbox::Logger::Severity::kWarning);
|
||||||
|
|
||||||
const auto log_level = utils::get_env_value("ANBOX_LOG_LEVEL", "");
|
const auto log_level = utils::get_env_value("ANBOX_LOG_LEVEL", "");
|
||||||
if (!log_level.empty())
|
if (!log_level.empty() || !Log().SetSeverityFromString(log_level))
|
||||||
Log().SetSeverity(log_level);
|
WARNING("Failed to set logging severity to '%s'", log_level);
|
||||||
}
|
}
|
||||||
|
|
||||||
int Daemon::Run(const std::vector<std::string> &arguments) try {
|
int Daemon::Run(const std::vector<std::string> &arguments) try {
|
||||||
|
|
|
||||||
|
|
@ -107,7 +107,7 @@ void SetInstance(const std::shared_ptr<anbox::Logger>& logger) {
|
||||||
}
|
}
|
||||||
namespace anbox {
|
namespace anbox {
|
||||||
|
|
||||||
void Logger::SetSeverity(const std::string& severity) {
|
bool Logger::SetSeverityFromString(const std::string& severity) {
|
||||||
if (severity == "trace")
|
if (severity == "trace")
|
||||||
SetSeverity(Severity::kTrace);
|
SetSeverity(Severity::kTrace);
|
||||||
else if (severity == "debug")
|
else if (severity == "debug")
|
||||||
|
|
@ -120,6 +120,9 @@ void Logger::SetSeverity(const std::string& severity) {
|
||||||
SetSeverity(Severity::kError);
|
SetSeverity(Severity::kError);
|
||||||
else if (severity == "fatal")
|
else if (severity == "fatal")
|
||||||
SetSeverity(Severity::kFatal);
|
SetSeverity(Severity::kFatal);
|
||||||
|
else
|
||||||
|
return false;
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
void Logger::Trace(const std::string& message,
|
void Logger::Trace(const std::string& message,
|
||||||
|
|
|
||||||
|
|
@ -49,7 +49,7 @@ class Logger : public DoNotCopyOrMove {
|
||||||
|
|
||||||
virtual void Init(const Severity& severity = Severity::kWarning) = 0;
|
virtual void Init(const Severity& severity = Severity::kWarning) = 0;
|
||||||
|
|
||||||
void SetSeverity(const std::string &severity);
|
bool SetSeverityFromString(const std::string &severity);
|
||||||
virtual void SetSeverity(const Severity& severity) = 0;
|
virtual void SetSeverity(const Severity& severity) = 0;
|
||||||
|
|
||||||
virtual void Log(Severity severity, const std::string& message,
|
virtual void Log(Severity severity, const std::string& message,
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue