From 580098eb4929a3bdbf424af18da361259ef2efe5 Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Sat, 20 Nov 2010 08:21:36 +0000 Subject: 2010-11-20 Tatsuhiro Tsujikawa Rewritten Logger interface. Logger now writes source file name and line number in log file. --- src/HandshakeExtensionMessage.cc | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'src/HandshakeExtensionMessage.cc') diff --git a/src/HandshakeExtensionMessage.cc b/src/HandshakeExtensionMessage.cc index c76f629b..925cc32a 100644 --- a/src/HandshakeExtensionMessage.cc +++ b/src/HandshakeExtensionMessage.cc @@ -40,6 +40,7 @@ #include "Logger.h" #include "message.h" #include "StringFormat.h" +#include "fmt.h" #include "bencode2.h" #include "DownloadContext.h" #include "bittorrent_helper.h" @@ -51,10 +52,10 @@ namespace aria2 { const std::string HandshakeExtensionMessage::EXTENSION_NAME = "handshake"; -HandshakeExtensionMessage::HandshakeExtensionMessage(): - tcpPort_(0), - metadataSize_(0), - logger_(LogFactory::getInstance()) {} +HandshakeExtensionMessage::HandshakeExtensionMessage() + : tcpPort_(0), + metadataSize_(0) +{} HandshakeExtensionMessage::~HandshakeExtensionMessage() {} @@ -175,11 +176,8 @@ HandshakeExtensionMessage::create(const unsigned char* data, size_t length) static_cast(length)).str()); } HandshakeExtensionMessageHandle msg(new HandshakeExtensionMessage()); - if(LogFactory::getInstance()->debug()) { - LogFactory::getInstance()->debug - ("Creating HandshakeExtensionMessage from %s", - util::percentEncode(data, length).c_str()); - } + A2_LOG_DEBUG(fmt("Creating HandshakeExtensionMessage from %s", + util::percentEncode(data, length).c_str())); SharedHandle decoded = bencode2::decode(data+1, length-1); const Dict* dict = asDict(decoded); if(!dict) { -- cgit