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

Logs the current thread's id in assertions and for requests, resolves #3534

Browse Source
This commit is contained in:
Daniel J. Hofmann 2017-01-09 05:36:49 +01:00 committed by Patrick Niklaus
parent c1f833c80f
commit f82740ed93
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/server/request_handler.cpp
View File

@ -25,6 +25,7 @@
#include <iostream> #include <iostream>
#include <iterator> #include <iterator>
#include <string> #include <string>
#include <thread>
namespace osrm namespace osrm
{ {
@ -46,13 +47,16 @@ void RequestHandler::HandleRequest(const http::request &current_request, http::r
return; return;
} }
const auto tid = std::this_thread::get_id();
// parse command // parse command
try try
{ {
TIMER_START(request_duration); TIMER_START(request_duration);
std::string request_string; std::string request_string;
util::URIDecode(current_request.uri, request_string); util::URIDecode(current_request.uri, request_string);
util::Log(logDEBUG) << "req: " << request_string;
util::Log(logDEBUG) << "[req][" << tid << "] " << request_string;
auto api_iterator = request_string.begin(); auto api_iterator = request_string.begin();
auto maybe_parsed_url = api::parseURL(api_iterator, request_string.end()); auto maybe_parsed_url = api::parseURL(api_iterator, request_string.end());
@ -158,7 +162,7 @@ void RequestHandler::HandleRequest(const http::request &current_request, http::r
catch (const std::exception &e) catch (const std::exception &e)
{ {
current_reply = http::reply::stock_reply(http::reply::internal_server_error); current_reply = http::reply::stock_reply(http::reply::internal_server_error);
util::Log(logWARNING) << "[server error] code: " << e.what() util::Log(logWARNING) << "[server error][" << tid << "] code: " << e.what()
<< ", uri: " << current_request.uri; << ", uri: " << current_request.uri;
} }
} }

6
src/util/assert.cpp
View File

@ -2,6 +2,7 @@
#include <exception> #include <exception>
#include <iostream> #include <iostream>
#include <thread>
namespace namespace
{ {
@ -9,7 +10,10 @@ namespace
[[noreturn]] void assertion_failed_msg_helper( [[noreturn]] void assertion_failed_msg_helper(
char const *expr, char const *msg, char const *function, char const *file, long line) char const *expr, char const *msg, char const *function, char const *file, long line)
{ {
std::cerr << "[assert] " << file << ":" << line << "\nin: " << function << ": " << expr << "\n" const auto tid = std::this_thread::get_id();
std::cerr << "[assert][" << tid << "] " << file << ":" << line << "\nin: " << function << ": "
<< expr << "\n"
<< msg; << msg;
std::terminate(); std::terminate();
} }