From 887929bfdefd5894bce2de6821a948b205915fcc Mon Sep 17 00:00:00 2001 From: Szczepan Zalega Date: Wed, 29 Mar 2017 12:17:49 +0200 Subject: Change log's date-time format. Code reformat. Signed-off-by: Szczepan Zalega --- log.cc | 59 ++++++++++++++++++++++++++++++----------------------------- 1 file changed, 30 insertions(+), 29 deletions(-) (limited to 'log.cc') diff --git a/log.cc b/log.cc index 70853fc..3370959 100644 --- a/log.cc +++ b/log.cc @@ -5,38 +5,39 @@ #include "log.h" namespace nitrokey { -namespace log { + namespace log { -Log *Log::mp_instance = nullptr; -StdlogHandler stdlog_handler; + Log *Log::mp_instance = nullptr; + StdlogHandler stdlog_handler; -std::string LogHandler::loglevel_to_str(Loglevel lvl) { - switch (lvl) { - case Loglevel::DEBUG_L2: - return std::string("DEBUG_L2"); - case Loglevel::DEBUG: - return std::string("DEBUG"); - case Loglevel::INFO: - return std::string("INFO"); - case Loglevel::WARNING: - return std::string("WARNING"); - case Loglevel::ERROR: - return std::string("ERROR"); - } - return std::string(""); -} + std::string LogHandler::loglevel_to_str(Loglevel lvl) { + switch (lvl) { + case Loglevel::DEBUG_L2: + return std::string("DEBUG_L2"); + case Loglevel::DEBUG: + return std::string("DEBUG"); + case Loglevel::INFO: + return std::string("INFO"); + case Loglevel::WARNING: + return std::string("WARNING"); + case Loglevel::ERROR: + return std::string("ERROR"); + } + return std::string(""); + } -void Log::operator()(const std::string &logstr, Loglevel lvl) { - if (mp_loghandler != nullptr) - if ((int)(lvl) >= (int)(m_loglevel)) mp_loghandler->print(logstr, lvl); -} + void Log::operator()(const std::string &logstr, Loglevel lvl) { + if (mp_loghandler != nullptr) + if ((int) lvl >= (int) m_loglevel) mp_loghandler->print(logstr, lvl); + } -void StdlogHandler::print(const std::string &str, Loglevel lvl) { - std::time_t t = std::time(nullptr); - std::tm tm = *std::localtime(&t); + void StdlogHandler::print(const std::string &str, Loglevel lvl) { + std::time_t t = std::time(nullptr); + std::tm tm = *std::localtime(&t); - std::clog << "[" << loglevel_to_str(lvl) << "] [" - << std::put_time(&tm, "%c %Z") << "]\t" << str << std::endl; -} -} + std::clog << "[" << loglevel_to_str(lvl) << "] [" + << std::put_time(&tm, "%c %z") + << "]\t" << str << std::endl; + } + } } -- cgit v1.2.1