From 580098eb4929a3bdbf424af18da361259ef2efe5 Mon Sep 17 00:00:00 2001
From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
Date: Sat, 20 Nov 2010 08:21:36 +0000
Subject: 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.
---
 src/UTMetadataRequestFactory.cc | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

(limited to 'src/UTMetadataRequestFactory.cc')

diff --git a/src/UTMetadataRequestFactory.cc b/src/UTMetadataRequestFactory.cc
index 40130b55..604449cf 100644
--- a/src/UTMetadataRequestFactory.cc
+++ b/src/UTMetadataRequestFactory.cc
@@ -41,15 +41,17 @@
 #include "UTMetadataRequestExtensionMessage.h"
 #include "UTMetadataRequestTracker.h"
 #include "BtMessage.h"
+#include "Logger.h"
 #include "LogFactory.h"
+#include "fmt.h"
 
 namespace aria2 {
 
-UTMetadataRequestFactory::UTMetadataRequestFactory():
-  dispatcher_(0),
-  messageFactory_(0),
-  tracker_(0),
-  logger_(LogFactory::getInstance()) {}
+UTMetadataRequestFactory::UTMetadataRequestFactory()
+  : dispatcher_(0),
+    messageFactory_(0),
+    tracker_(0)
+{}
 
 void UTMetadataRequestFactory::create
 (std::vector<SharedHandle<BtMessage> >& msgs, size_t num,
@@ -60,16 +62,12 @@ void UTMetadataRequestFactory::create
     SharedHandle<Piece> p =
       pieceStorage->getMissingPiece(peer_, metadataRequests);
     if(!p) {
-      if(logger_->debug()) {
-        logger_->debug("No ut_metadata piece is available to download.");
-      }
+      A2_LOG_DEBUG("No ut_metadata piece is available to download.");
       break;
     }
     --num;
-    if(logger_->debug()) {
-      logger_->debug("Creating ut_metadata request index=%lu",
-                     static_cast<unsigned long>(p->getIndex()));
-    }
+    A2_LOG_DEBUG(fmt("Creating ut_metadata request index=%lu",
+                     static_cast<unsigned long>(p->getIndex())));
     SharedHandle<UTMetadataRequestExtensionMessage> m
       (new UTMetadataRequestExtensionMessage
        (peer_->getExtensionMessageID("ut_metadata")));
-- 
cgit