From 39276dcb00b33372e1ac5fbd0de2d60c733aeb60 Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Mon, 17 Apr 2006 16:17:20 +0000 Subject: To add LogFactory which creates singleton logger: * src/LogFactory.h: New class. * src/LogFactory.cc: New class. * src/Command.h (logger): New variable. (Constructor): Use LogFactory. * src/AbstractCommand.cc: Use Command::logger * src/PeerConnection.cc (Constructor): Deleted the argument logger. Use LogFactory. * src/SegmentSplitter.h : Made logger protected. * src/SegmentSplitter.cc (Constructor): Use LogFactory. * src/SegmentMan.cc (Constructor): Use LogFactory. * src/DownloadEngine.h : Made logger protected. * src/DownloadEngine.cc (Constructor): Use LogFactory. * src/PeerInteractionCommand.cc : Use Command::logger. * src/HttpResponseCommand.cc : Use Command::logger. * src/SegmentMan.h : Made logger private. * src/TorrentMan.h : Made logger private. * src/TorrentMan.cc : Use LogFactory. * src/FtpNegotiateCommand.cc : Use Command::logger. * src/HttpConnection.h (Constructor): Deleted the argument logger. * src/HttpConnection.cc (Constructor): Deleted the argument logger. Use LogFactory. * src/FtpConnection.h (Constructor): Deleted the argument logger. * src/FtpConnection.cc (Constructor): Deleted the argument logger. Use LogFactory. * src/DownloadCommand.cc : Use Command::logger. * src/PeerAbstractCommand.cc : Use Command::logger. * src/PeerListenCommand.cc : Use Command::logger. * src/PeerInitiateConnectionCommand.cc : Use Command::logger. * src/HttpInitiateConnectionCommand.cc : Use Command::logger. * src/FtpInitiateConnectionCommand.cc : Use Command::logger. * src/TrackerWatcherCommand.cc : Use Command::logger. * src/TrackerUpdateCommand.cc : Use Command::logger. * src/TrackerDownloadCommand.cc : Use Command::logger. * src/RequestSlotMan.cc (Constructor): Deleted the argument logger. Use LogFactory. * src/SendMessageQueue.h (Constructor): Deleted the argument logger. * src/SendMessageQueue.cc (Constructor): Deleted the argument logger. Use LogFactory. * src/main.cc (main): Use LogFactory. * src/DiskAdaptor.h (logger): New variable. * src/DiskAdaptor.cc (Constructor): Use LogFactory. * src/CopyDiskAdaptor.cc (fixFilename): Added a log message. --- src/TrackerUpdateCommand.cc | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'src/TrackerUpdateCommand.cc') diff --git a/src/TrackerUpdateCommand.cc b/src/TrackerUpdateCommand.cc index c5b1f001..6b2ed6b6 100644 --- a/src/TrackerUpdateCommand.cc +++ b/src/TrackerUpdateCommand.cc @@ -31,7 +31,8 @@ TrackerUpdateCommand::TrackerUpdateCommand(int cuid, Request* req, TorrentDownloadEngine* e, MetaEntry* trackerResponse) - :Command(cuid), req(req), e(e), trackerResponse(trackerResponse) {} + :Command(cuid), req(req), e(e), trackerResponse(trackerResponse) { +} TrackerUpdateCommand::~TrackerUpdateCommand() { delete trackerResponse; @@ -45,22 +46,22 @@ bool TrackerUpdateCommand::execute() { } Data* warningMessage = (Data*)response->get("warning message"); if(warningMessage != NULL) { - e->logger->warn(MSG_TRACKER_WARNING_MESSAGE, cuid, warningMessage->toString().c_str()); + logger->warn(MSG_TRACKER_WARNING_MESSAGE, cuid, warningMessage->toString().c_str()); } Data* trackerId = (Data*)response->get("tracker id"); if(trackerId != NULL) { e->torrentMan->trackerId = trackerId->toString(); - e->logger->debug("CUID#%d - Tracker ID:%s", cuid, e->torrentMan->trackerId.c_str()); + logger->debug("CUID#%d - Tracker ID:%s", cuid, e->torrentMan->trackerId.c_str()); } Data* interval = (Data*)response->get("interval"); if(interval != NULL) { e->torrentMan->interval = interval->toInt(); - e->logger->debug("CUID#%d - interval:%d", cuid, e->torrentMan->interval); + logger->debug("CUID#%d - interval:%d", cuid, e->torrentMan->interval); } Data* minInterval = (Data*)response->get("min interval"); if(minInterval != NULL) { e->torrentMan->minInterval = minInterval->toInt(); - e->logger->debug("CUID#%d - min interval:%d", cuid, e->torrentMan->minInterval); + logger->debug("CUID#%d - min interval:%d", cuid, e->torrentMan->minInterval); } if(e->torrentMan->minInterval > e->torrentMan->interval) { e->torrentMan->minInterval = e->torrentMan->interval; @@ -68,12 +69,12 @@ bool TrackerUpdateCommand::execute() { Data* complete = (Data*)response->get("complete"); if(complete != NULL) { e->torrentMan->complete = complete->toInt(); - e->logger->debug("CUID#%d - complete:%d", cuid, e->torrentMan->complete); + logger->debug("CUID#%d - complete:%d", cuid, e->torrentMan->complete); } Data* incomplete = (Data*)response->get("incomplete"); if(incomplete != NULL) { e->torrentMan->incomplete = incomplete->toInt(); - e->logger->debug("CUID#%d - incomplete:%d", cuid, e->torrentMan->incomplete); + logger->debug("CUID#%d - incomplete:%d", cuid, e->torrentMan->incomplete); } Data* peers = (Data*)response->get("peers"); if(peers != NULL) { @@ -90,14 +91,14 @@ bool TrackerUpdateCommand::execute() { Peer* peer = new Peer(ipaddr, port, e->torrentMan->pieceLength, e->torrentMan->getTotalLength()); if(e->torrentMan->addPeer(peer)) { - e->logger->debug("CUID#%d - adding peer %s:%d", cuid, + logger->debug("CUID#%d - adding peer %s:%d", cuid, peer->ipaddr.c_str(), peer->port); } else { delete peer; } } } else { - e->logger->info("CUID#%d - no peer list received.", cuid); + logger->info("CUID#%d - no peer list received.", cuid); } while(e->torrentMan->isPeerAvailable() && e->torrentMan->connections < MAX_PEER_UPDATE) { @@ -106,7 +107,7 @@ bool TrackerUpdateCommand::execute() { peer->cuid = newCuid; PeerInitiateConnectionCommand* command = new PeerInitiateConnectionCommand(newCuid, peer, e); e->commands.push(command); - e->logger->debug("CUID#%d - adding new command CUID#%d", cuid, newCuid); + logger->debug("CUID#%d - adding new command CUID#%d", cuid, newCuid); } if(req->getTrackerEvent() == Request::STARTED) { req->setTrackerEvent(Request::AUTO); -- cgit