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/PeerInitiateConnectionCommand.cc | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

(limited to 'src/PeerInitiateConnectionCommand.cc')

diff --git a/src/PeerInitiateConnectionCommand.cc b/src/PeerInitiateConnectionCommand.cc
index 95e62869..3c258d57 100644
--- a/src/PeerInitiateConnectionCommand.cc
+++ b/src/PeerInitiateConnectionCommand.cc
@@ -41,6 +41,7 @@
 #include "prefs.h"
 #include "Socket.h"
 #include "Logger.h"
+#include "LogFactory.h"
 #include "Peer.h"
 #include "BtRuntime.h"
 #include "PeerStorage.h"
@@ -48,6 +49,7 @@
 #include "PeerConnection.h"
 #include "RequestGroup.h"
 #include "util.h"
+#include "fmt.h"
 
 namespace aria2 {
 
@@ -58,11 +60,10 @@ PeerInitiateConnectionCommand::PeerInitiateConnectionCommand
  DownloadEngine* e,
  const SharedHandle<BtRuntime>& btRuntime,
  bool mseHandshakeEnabled)
-  :
-  PeerAbstractCommand(cuid, peer, e),
-  requestGroup_(requestGroup),
-  btRuntime_(btRuntime),
-  mseHandshakeEnabled_(mseHandshakeEnabled)
+  : PeerAbstractCommand(cuid, peer, e),
+    requestGroup_(requestGroup),
+    btRuntime_(btRuntime),
+    mseHandshakeEnabled_(mseHandshakeEnabled)
 {
   btRuntime_->increaseConnections();
   requestGroup_->increaseNumCommand();
@@ -75,12 +76,10 @@ PeerInitiateConnectionCommand::~PeerInitiateConnectionCommand()
 }
 
 bool PeerInitiateConnectionCommand::executeInternal() {
-  if(getLogger()->info()) {
-    getLogger()->info(MSG_CONNECTING_TO_SERVER,
-                      util::itos(getCuid()).c_str(),
-                      getPeer()->getIPAddress().c_str(),
-                      getPeer()->getPort());
-  }
+  A2_LOG_INFO(fmt(MSG_CONNECTING_TO_SERVER,
+                  util::itos(getCuid()).c_str(),
+                  getPeer()->getIPAddress().c_str(),
+                  getPeer()->getPort()));
   createSocket();
   getSocket()->establishConnection(getPeer()->getIPAddress(),
                                    getPeer()->getPort());
-- 
cgit