From 2b37d0147e95765a50dbb0ff5fa1e6509c6f2795 Mon Sep 17 00:00:00 2001 From: Alexey Rybalchenko Date: Thu, 9 Jul 2020 10:38:46 +0200 Subject: [PATCH] make GetColoredSeverityString public --- logger/Logger.cxx | 38 +++++++++++++++++++------------------- logger/Logger.h | 1 + 2 files changed, 20 insertions(+), 19 deletions(-) diff --git a/logger/Logger.cxx b/logger/Logger.cxx index e26a254..10e77bd 100644 --- a/logger/Logger.cxx +++ b/logger/Logger.cxx @@ -23,25 +23,6 @@ namespace fair using VSpec = VerbositySpec; -string GetColoredSeverityString(Severity severity) -{ - switch (severity) { - case Severity::nolog: return "\033[01;39mNOLOG\033[0m"; break; - case Severity::fatal: return "\033[01;31mFATAL\033[0m"; break; - case Severity::error: return "\033[01;31mERROR\033[0m"; break; - case Severity::warn: return "\033[01;33mWARN\033[0m"; break; - case Severity::state: return "\033[01;35mSTATE\033[0m"; break; - case Severity::info: return "\033[01;32mINFO\033[0m"; break; - case Severity::debug: return "\033[01;34mDEBUG\033[0m"; break; - case Severity::debug1: return "\033[01;34mDEBUG1\033[0m"; break; - case Severity::debug2: return "\033[01;34mDEBUG2\033[0m"; break; - case Severity::debug3: return "\033[01;34mDEBUG3\033[0m"; break; - case Severity::debug4: return "\033[01;34mDEBUG4\033[0m"; break; - case Severity::trace: return "\033[01;36mTRACE\033[0m"; break; - default: return "UNKNOWN"; break; - } -} - bool Logger::fColored = false; fstream Logger::fFileStream; Verbosity Logger::fVerbosity = Verbosity::low; @@ -294,6 +275,25 @@ void Logger::LogEmptyLine() // this call just to prevent any output to be added to the logger object } +string Logger::GetColoredSeverityString(Severity severity) +{ + switch (severity) { + case Severity::nolog: return "\033[01;39mNOLOG\033[0m"; break; + case Severity::fatal: return "\033[01;31mFATAL\033[0m"; break; + case Severity::error: return "\033[01;31mERROR\033[0m"; break; + case Severity::warn: return "\033[01;33mWARN\033[0m"; break; + case Severity::state: return "\033[01;35mSTATE\033[0m"; break; + case Severity::info: return "\033[01;32mINFO\033[0m"; break; + case Severity::debug: return "\033[01;34mDEBUG\033[0m"; break; + case Severity::debug1: return "\033[01;34mDEBUG1\033[0m"; break; + case Severity::debug2: return "\033[01;34mDEBUG2\033[0m"; break; + case Severity::debug3: return "\033[01;34mDEBUG3\033[0m"; break; + case Severity::debug4: return "\033[01;34mDEBUG4\033[0m"; break; + case Severity::trace: return "\033[01;36mTRACE\033[0m"; break; + default: return "UNKNOWN"; break; + } +} + void Logger::SetConsoleSeverity(const Severity severity) { fConsoleSeverity = severity; diff --git a/logger/Logger.h b/logger/Logger.h index c6e2908..7f0b1b6 100644 --- a/logger/Logger.h +++ b/logger/Logger.h @@ -239,6 +239,7 @@ class Logger static std::string startColor(Color color) { return fmt::format("\033[01;{}m", static_cast(color)); } static std::string endColor() { return "\033[0m"; } static std::string ColorOut(Color c, const std::string& s) { return fmt::format("\033[01;{}m{}\033[0m", static_cast(c), s); } + static std::string GetColoredSeverityString(Severity severity); static void SetConsoleSeverity(const Severity severity); static void SetConsoleSeverity(const std::string& severityStr);