From 7b9b2fd23a30ad99aba69d39c88f4b06984ca2cc Mon Sep 17 00:00:00 2001 From: Dennis Luxen Date: Wed, 7 May 2014 16:50:48 +0200 Subject: [PATCH] use C++11's put time to put the timestamp --- Server/RequestHandler.cpp | 18 ++++++------------ Server/RequestHandler.h | 6 +++--- 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/Server/RequestHandler.cpp b/Server/RequestHandler.cpp index f921ca1f9..605342c47 100644 --- a/Server/RequestHandler.cpp +++ b/Server/RequestHandler.cpp @@ -37,7 +37,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include +#include + #include +#include #include RequestHandler::RequestHandler() : routing_machine(NULL) { } @@ -48,19 +51,10 @@ void RequestHandler::handle_request(const http::Request& req, http::Reply& rep){ std::string request; URIDecode(req.uri, request); - time_t ltime; - struct tm *Tm; + std::time_t t = std::time(nullptr); - ltime=time(NULL); - Tm=localtime(<ime); - - SimpleLogger().Write() << - (Tm->tm_mday < 10 ? "0" : "" ) << Tm->tm_mday << "-" << - (Tm->tm_mon+1 < 10 ? "0" : "" ) << (Tm->tm_mon+1) << "-" << - 1900+Tm->tm_year << " " << (Tm->tm_hour < 10 ? "0" : "" ) << - Tm->tm_hour << ":" << (Tm->tm_min < 10 ? "0" : "" ) << - Tm->tm_min << ":" << (Tm->tm_sec < 10 ? "0" : "" ) << - Tm->tm_sec << " " << req.endpoint.to_string() << " " << + SimpleLogger().Write() << std::put_time(std::localtime(&t), "%m-%d-%Y %H:%M:%S") << + " " << req.endpoint.to_string() << " " << req.referrer << ( 0 == req.referrer.length() ? "- " :" ") << req.agent << ( 0 == req.agent.length() ? "- " :" ") << request; diff --git a/Server/RequestHandler.h b/Server/RequestHandler.h index ae7591aea..4d89decc5 100644 --- a/Server/RequestHandler.h +++ b/Server/RequestHandler.h @@ -28,8 +28,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef REQUEST_HANDLER_H #define REQUEST_HANDLER_H -#include - #include template @@ -42,12 +40,14 @@ namespace http { struct Request; } -class RequestHandler : private boost::noncopyable { +class RequestHandler +{ public: typedef APIGrammar APIGrammarParser; RequestHandler(); + RequestHandler(const RequestHandler &) = delete; void handle_request(const http::Request& req, http::Reply& rep); void RegisterRoutingMachine(OSRM * osrm);