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/DHTPeerLookupTask.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/DHTPeerLookupTask.cc')
| -rw-r--r-- | src/DHTPeerLookupTask.cc | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/src/DHTPeerLookupTask.cc b/src/DHTPeerLookupTask.cc index 77d563e4..94c0de12 100644 --- a/src/DHTPeerLookupTask.cc +++ b/src/DHTPeerLookupTask.cc @@ -36,6 +36,7 @@ #include "Peer.h" #include "DHTGetPeersReplyMessage.h" #include "Logger.h" +#include "LogFactory.h" #include "DHTMessageFactory.h" #include "DHTNode.h" #include "DHTNodeLookupEntry.h" @@ -48,13 +49,15 @@ #include "bittorrent_helper.h" #include "DHTPeerLookupTaskCallback.h" #include "DHTQueryMessage.h" +#include "fmt.h" namespace aria2 { DHTPeerLookupTask::DHTPeerLookupTask -(const SharedHandle<DownloadContext>& downloadContext): - DHTAbstractNodeLookupTask<DHTGetPeersReplyMessage> - (bittorrent::getInfoHash(downloadContext)) {} +(const SharedHandle<DownloadContext>& downloadContext) + : DHTAbstractNodeLookupTask<DHTGetPeersReplyMessage> + (bittorrent::getInfoHash(downloadContext)) +{} void DHTPeerLookupTask::getNodesFromMessage @@ -75,8 +78,8 @@ void DHTPeerLookupTask::onReceivedInternal peerStorage_->addPeer(message->getValues()); peers_.insert(peers_.end(), message->getValues().begin(), message->getValues().end()); - getLogger()->info("Received %lu peers.", - static_cast<unsigned long>(message->getValues().size())); + A2_LOG_INFO(fmt("Received %lu peers.", + static_cast<unsigned long>(message->getValues().size()))); } SharedHandle<DHTMessage> DHTPeerLookupTask::createMessage @@ -93,10 +96,8 @@ SharedHandle<DHTMessageCallback> DHTPeerLookupTask::createCallback() void DHTPeerLookupTask::onFinish() { - if(getLogger()->debug()) { - getLogger()->debug("Peer lookup for %s finished", - util::toHex(getTargetID(), DHT_ID_LENGTH).c_str()); - } + A2_LOG_DEBUG(fmt("Peer lookup for %s finished", + util::toHex(getTargetID(), DHT_ID_LENGTH).c_str())); // send announce_peer message to K closest nodes size_t num = DHTBucket::K; for(std::deque<SharedHandle<DHTNodeLookupEntry> >::const_iterator i = |