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/DHTEntryPointNameResolveCommand.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/DHTEntryPointNameResolveCommand.cc')
| -rw-r--r-- | src/DHTEntryPointNameResolveCommand.cc | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/src/DHTEntryPointNameResolveCommand.cc b/src/DHTEntryPointNameResolveCommand.cc index 9f4c1a5f..20f506a7 100644 --- a/src/DHTEntryPointNameResolveCommand.cc +++ b/src/DHTEntryPointNameResolveCommand.cc @@ -47,7 +47,9 @@ #include "DHTTask.h" #include "RequestGroupMan.h" #include "Logger.h" +#include "LogFactory.h" #include "StringFormat.h" +#include "fmt.h" #ifdef ENABLE_ASYNC_DNS #include "AsyncNameResolver.h" #endif // ENABLE_ASYNC_DNS @@ -108,7 +110,7 @@ bool DHTEntryPointNameResolveCommand::execute() return false; } } catch(RecoverableException& e) { - getLogger()->error(EX_EXCEPTION_CAUGHT, e); + A2_LOG_ERROR_EX(EX_EXCEPTION_CAUGHT, e); } resolver_->reset(); entryPoints_.pop_front(); @@ -129,7 +131,7 @@ bool DHTEntryPointNameResolveCommand::execute() resolvedEntryPoints_.push_back(p); addPingTask(p); } catch(RecoverableException& e) { - getLogger()->error(EX_EXCEPTION_CAUGHT, e); + A2_LOG_ERROR_EX(EX_EXCEPTION_CAUGHT, e); } entryPoints_.pop_front(); } @@ -140,7 +142,7 @@ bool DHTEntryPointNameResolveCommand::execute() taskQueue_->addPeriodicTask1(taskFactory_->createBucketRefreshTask()); } } catch(RecoverableException& e) { - getLogger()->error(EX_EXCEPTION_CAUGHT, e); + A2_LOG_ERROR_EX(EX_EXCEPTION_CAUGHT, e); } return true; } @@ -163,20 +165,17 @@ bool DHTEntryPointNameResolveCommand::resolveHostname { switch(resolver->getStatus()) { case AsyncNameResolver::STATUS_READY: - if(getLogger()->info()) { - getLogger()->info(MSG_RESOLVING_HOSTNAME, - util::itos(getCuid()).c_str(), hostname.c_str()); - } + A2_LOG_INFO(fmt(MSG_RESOLVING_HOSTNAME, + util::itos(getCuid()).c_str(), + hostname.c_str())); resolver->resolve(hostname); setNameResolverCheck(resolver); return false; case AsyncNameResolver::STATUS_SUCCESS: - if(getLogger()->info()) { - getLogger()->info(MSG_NAME_RESOLUTION_COMPLETE, - util::itos(getCuid()).c_str(), - resolver->getHostname().c_str(), - resolver->getResolvedAddresses().front().c_str()); - } + A2_LOG_INFO(fmt(MSG_NAME_RESOLUTION_COMPLETE, + util::itos(getCuid()).c_str(), + resolver->getHostname().c_str(), + resolver->getResolvedAddresses().front().c_str())); return true; break; case AsyncNameResolver::STATUS_ERROR: |