diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2010-11-20 08:21:36 +0000 |
|---|---|---|
| committer | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2010-11-20 08:21:36 +0000 |
| commit | 580098eb4929a3bdbf424af18da361259ef2efe5 (patch) | |
| tree | c6ff77fa55fcbdcdd0ca21ec2105db14a8c050d3 /src/HttpServer.cc | |
| parent | 3940da75624b194cdd5036f9fe330fcecc725964 (diff) | |
2010-11-20 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Rewritten Logger interface. Logger now writes source file name and
line number in log file.
Diffstat (limited to 'src/HttpServer.cc')
| -rw-r--r-- | src/HttpServer.cc | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/src/HttpServer.cc b/src/HttpServer.cc index 4f1e5e92..fd8f9b6b 100644 --- a/src/HttpServer.cc +++ b/src/HttpServer.cc @@ -46,20 +46,21 @@ #include "Logger.h" #include "Base64.h" #include "a2functional.h" +#include "fmt.h" namespace aria2 { -HttpServer::HttpServer(const SharedHandle<SocketCore>& socket, - DownloadEngine* e): - socket_(socket), - socketBuffer_(socket), - e_(e), - headerProcessor_(new HttpHeaderProcessor()), - logger_(LogFactory::getInstance()), - keepAlive_(true), - gzip_(false), - acceptsPersistentConnection_(true), - acceptsGZip_(false) +HttpServer::HttpServer +(const SharedHandle<SocketCore>& socket, + DownloadEngine* e) + : socket_(socket), + socketBuffer_(socket), + e_(e), + headerProcessor_(new HttpHeaderProcessor()), + keepAlive_(true), + gzip_(false), + acceptsPersistentConnection_(true), + acceptsGZip_(false) {} HttpServer::~HttpServer() {} @@ -83,8 +84,8 @@ SharedHandle<HttpHeader> HttpServer::receiveRequest() SharedHandle<HttpHeader> header = headerProcessor_->getHttpRequestHeader(); if(header) { - logger_->info("HTTP Server received request\n%s", - headerProcessor_->getHeaderString().c_str()); + A2_LOG_INFO(fmt("HTTP Server received request\n%s", + headerProcessor_->getHeaderString().c_str())); lastRequestHeader_ = header; lastBody_.clear(); lastBody_.str(""); @@ -165,9 +166,7 @@ void HttpServer::feedResponse(const std::string& status, } header += "\r\n"; - if(logger_->debug()) { - logger_->debug("HTTP Server sends response:\n%s", header.c_str()); - } + A2_LOG_DEBUG(fmt("HTTP Server sends response:\n%s", header.c_str())); socketBuffer_.pushStr(header); socketBuffer_.pushStr(text); } |