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

rethrow exception, refactor default block in fully covered switch statement

Browse Source
This commit is contained in:
Dennis Luxen 2014-10-14 15:59:18 +02:00
parent 1fc1e9590a
commit e6a00ddcfd
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Util/simple_logger.cpp
View File

@ -87,9 +87,6 @@ std::ostringstream &SimpleLogger::Write(LogLevel l)
os << "["; os << "[";
switch (level) switch (level)
{ {
case logINFO:
os << "info";
break;
case logWARNING: case logWARNING:
os << "warn"; os << "warn";
break; break;
@ -98,14 +95,16 @@ std::ostringstream &SimpleLogger::Write(LogLevel l)
os << "debug"; os << "debug";
#endif #endif
break; break;
default: default: //logINFO:
throw OSRMException("unkown logging state"); os << "info";
break; break;
} }
os << "] "; os << "] ";
} }
catch (...) catch (const std::exception &e)
{ {
// encapsulate in OSRMException
throw OSRMException(std::string(e.what()) + ", getting ostringstream");
} }
return os; return os;
} }
@ -118,9 +117,6 @@ SimpleLogger::~SimpleLogger()
const bool is_terminal = (0 != isatty(fileno(stdout)) ? true : false); const bool is_terminal = (0 != isatty(fileno(stdout)) ? true : false);
switch (level) switch (level)
{ {
case logINFO:
std::cout << os.str() << (is_terminal ? COL_RESET : "") << std::endl;
break;
case logWARNING: case logWARNING:
std::cerr << (is_terminal ? RED : "") << os.str() << (is_terminal ? COL_RESET : "") std::cerr << (is_terminal ? RED : "") << os.str() << (is_terminal ? COL_RESET : "")
<< std::endl; << std::endl;
@ -131,8 +127,8 @@ SimpleLogger::~SimpleLogger()
<< std::endl; << std::endl;
#endif #endif
break; break;
default: default: //logINFO:
throw OSRMException("unkown logging state"); std::cout << os.str() << (is_terminal ? COL_RESET : "") << std::endl;
break; break;
} }
} }