Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Add --verbosity,-l command line option

Browse Source 
Allow to fine-control logging verbosity via command line
and LogPolicy setting (useful when OSRM used as library).

Closes #4299
This commit is contained in:
Mateusz Loskot
2017-08-28 21:20:13 +02:00
committed by Patrick Niklaus
parent fb5bd818d9
commit 7323221e3b
13 changed files with 144 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/util/log.cpp
+51 -16
View File
@@ -1,5 +1,6 @@
#include "util/log.hpp"
#include "util/isatty.hpp"
#include <boost/algorithm/string/predicate.hpp>
#include <cstdio>
#include <iostream>
#include <mutex>
@@ -29,32 +30,64 @@ void LogPolicy::Mute() { m_is_mute = true; }
bool LogPolicy::IsMute() const { return m_is_mute; }
LogLevel LogPolicy::GetLevel() const { return m_level; }
void LogPolicy::SetLevel(LogLevel level) { m_level = level; }
void LogPolicy::SetLevel(std::string const &level)
{
// Keep in sync with LogLevel definition
if (boost::iequals(level, "NONE"))
m_level = logNONE;
else if (boost::iequals(level, "ERROR"))
m_level = logERROR;
else if (boost::iequals(level, "WARNING"))
m_level = logWARNING;
else if (boost::iequals(level, "INFO"))
m_level = logINFO;
else if (boost::iequals(level, "DEBUG"))
m_level = logDEBUG;
else
;
}
LogPolicy &LogPolicy::GetInstance()
{
static LogPolicy runningInstance;
return runningInstance;
}
std::string LogPolicy::GetLevels()
{
// Keep in sync with LogLevel definition
return "NONE, ERROR, WARNING, INFO, DEBUG";
}
Log::Log(LogLevel level_, std::ostream &ostream) : level(level_), stream(ostream)
{
const bool is_terminal = IsStdoutATTY();
std::lock_guard<std::mutex> lock(get_mutex());
switch (level)
if (!LogPolicy::GetInstance().IsMute() && level <= LogPolicy::GetInstance().GetLevel())
{
case logWARNING:
stream << (is_terminal ? YELLOW : "") << "[warn] ";
break;
case logERROR:
stream << (is_terminal ? RED : "") << "[error] ";
break;
case logDEBUG:
const bool is_terminal = IsStdoutATTY();
switch (level)
{
case logNONE:
break;
case logWARNING:
stream << (is_terminal ? YELLOW : "") << "[warn] ";
break;
case logERROR:
stream << (is_terminal ? RED : "") << "[error] ";
break;
case logDEBUG:
#ifndef NDEBUG
stream << (is_terminal ? MAGENTA : "") << "[debug] ";
stream << (is_terminal ? MAGENTA : "") << "[debug] ";
#endif
break;
default: // logINFO:
stream << "[info] ";
break;
break;
default: // logINFO:
stream << "[info] ";
break;
}
}
}
@@ -76,14 +109,16 @@ std::mutex &Log::get_mutex()
Log::~Log()
{
std::lock_guard<std::mutex> lock(get_mutex());
const bool usestd = (&stream == &buffer);
if (!LogPolicy::GetInstance().IsMute())
if (!LogPolicy::GetInstance().IsMute() && level <= LogPolicy::GetInstance().GetLevel())
{
const bool usestd = (&stream == &buffer);
const bool is_terminal = IsStdoutATTY();
if (usestd)
{
switch (level)
{
case logNONE:
break;
case logWARNING:
case logERROR:
std::cerr << buffer.str();