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/FtpInitiateConnectionCommand.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/FtpInitiateConnectionCommand.cc')
| -rw-r--r-- | src/FtpInitiateConnectionCommand.cc | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/FtpInitiateConnectionCommand.cc b/src/FtpInitiateConnectionCommand.cc index 7538f23e..f7f54c66 100644 --- a/src/FtpInitiateConnectionCommand.cc +++ b/src/FtpInitiateConnectionCommand.cc @@ -46,6 +46,7 @@ #include "FtpTunnelRequestCommand.h" #include "DlAbortEx.h" #include "Logger.h" +#include "LogFactory.h" #include "message.h" #include "prefs.h" #include "HttpConnection.h" @@ -53,6 +54,7 @@ #include "util.h" #include "AuthConfigFactory.h" #include "AuthConfig.h" +#include "fmt.h" namespace aria2 { @@ -88,10 +90,8 @@ Command* FtpInitiateConnectionCommand::createNextCommand proxyRequest->getHost(), proxyRequest->getPort()); } if(!pooledSocket) { - if(getLogger()->info()) { - getLogger()->info(MSG_CONNECTING_TO_SERVER, - util::itos(getCuid()).c_str(), addr.c_str(), port); - } + A2_LOG_INFO(fmt(MSG_CONNECTING_TO_SERVER, + util::itos(getCuid()).c_str(), addr.c_str(), port)); createSocket(); getSocket()->establishConnection(addr, port); @@ -153,10 +153,8 @@ Command* FtpInitiateConnectionCommand::createNextCommand getDownloadEngine()->getAuthConfigFactory()->createAuthConfig (getRequest(), getOption().get())->getUser()); if(!pooledSocket) { - if(getLogger()->info()) { - getLogger()->info(MSG_CONNECTING_TO_SERVER, - util::itos(getCuid()).c_str(), addr.c_str(), port); - } + A2_LOG_INFO(fmt(MSG_CONNECTING_TO_SERVER, + util::itos(getCuid()).c_str(), addr.c_str(), port)); createSocket(); getSocket()->establishConnection(addr, port); FtpNegotiationCommand* c = |