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/HttpResponse.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/HttpResponse.cc')
| -rw-r--r-- | src/HttpResponse.cc | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/src/HttpResponse.cc b/src/HttpResponse.cc index 1abe0148..963b84bd 100644 --- a/src/HttpResponse.cc +++ b/src/HttpResponse.cc @@ -45,6 +45,7 @@ #include "DlAbortEx.h" #include "DlRetryEx.h" #include "StringFormat.h" +#include "fmt.h" #include "A2STR.h" #include "CookieStorage.h" #include "AuthConfigFactory.h" @@ -56,8 +57,8 @@ namespace aria2 { -HttpResponse::HttpResponse():cuid_(0), - logger_(LogFactory::getInstance()) +HttpResponse::HttpResponse() + : cuid_(0) {} HttpResponse::~HttpResponse() {} @@ -117,10 +118,9 @@ std::string HttpResponse::determinFilename() const return file; } } else { - if(logger_->info()) { - logger_->info(MSG_CONTENT_DISPOSITION_DETECTED, - util::itos(cuid_).c_str(), contentDisposition.c_str()); - } + A2_LOG_INFO(fmt(MSG_CONTENT_DISPOSITION_DETECTED, + util::itos(cuid_).c_str(), + contentDisposition.c_str())); return contentDisposition; } } @@ -150,10 +150,9 @@ void HttpResponse::processRedirect() { if(httpRequest_->getRequest()->redirectUri(getRedirectURI())) { - if(logger_->info()) { - logger_->info(MSG_REDIRECT, util::itos(cuid_).c_str(), - httpRequest_->getRequest()->getCurrentUri().c_str()); - } + A2_LOG_INFO(fmt(MSG_REDIRECT, + util::itos(cuid_).c_str(), + httpRequest_->getRequest()->getCurrentUri().c_str())); } else { throw DL_RETRY_EX (StringFormat("CUID#%s - Redirect to %s failed. It may not be a valid" |