diff options
Diffstat (limited to 'src')
46 files changed, 262 insertions, 137 deletions
diff --git a/src/AbstractCommand.cc b/src/AbstractCommand.cc index a6ff1352..70938917 100644 --- a/src/AbstractCommand.cc +++ b/src/AbstractCommand.cc @@ -23,11 +23,11 @@ #include "DlAbortEx.h" #include "DlRetryEx.h" #include "InitiateConnectionCommandFactory.h" -#include <sys/time.h> #include "Util.h" #include "message.h" #include "SleepCommand.h" #include "prefs.h" +#include <sys/time.h> AbstractCommand::AbstractCommand(int cuid, Request* req, DownloadEngine* e, const Socket* s): Command(cuid), req(req), e(e), checkSocketIsReadable(false), checkSocketIsWritable(false) { @@ -86,19 +86,19 @@ bool AbstractCommand::execute() { // get segment information in order to set Range header. if(!e->segmentMan->getSegment(seg, cuid)) { // no segment available - e->logger->info(MSG_NO_SEGMENT_AVAILABLE, cuid); + logger->info(MSG_NO_SEGMENT_AVAILABLE, cuid); return true; } } return executeInternal(seg); } catch(DlAbortEx* err) { - e->logger->error(MSG_DOWNLOAD_ABORTED, err, cuid); + logger->error(MSG_DOWNLOAD_ABORTED, err, cuid); onAbort(err); delete(err); req->resetUrl(); return true; } catch(DlRetryEx* err) { - e->logger->error(MSG_RESTARTING_DOWNLOAD, err, cuid); + logger->error(MSG_RESTARTING_DOWNLOAD, err, cuid); req->addTryCount(); bool isAbort = e->option->getAsInt(PREF_MAX_TRIES) != 0 && req->getTryCount() >= e->option->getAsInt(PREF_MAX_TRIES); @@ -107,7 +107,7 @@ bool AbstractCommand::execute() { } delete(err); if(isAbort) { - e->logger->error(MSG_MAX_TRY, cuid, req->getTryCount()); + logger->error(MSG_MAX_TRY, cuid, req->getTryCount()); return true; } else { return prepareForRetry(e->option->getAsInt(PREF_RETRY_WAIT)); @@ -127,7 +127,7 @@ bool AbstractCommand::prepareForRetry(int wait) { } void AbstractCommand::onAbort(Exception* ex) { - e->logger->debug(MSG_UNREGISTER_CUID, cuid); + logger->debug(MSG_UNREGISTER_CUID, cuid); e->segmentMan->unregisterId(cuid); } diff --git a/src/Command.h b/src/Command.h index c79a8588..4b0639cd 100644 --- a/src/Command.h +++ b/src/Command.h @@ -23,12 +23,16 @@ #define _D_COMMAND_H_ #include "common.h" +#include "LogFactory.h" class Command { protected: int cuid; + const Logger* logger; public: - Command(int cuid):cuid(cuid) {} + Command(int cuid):cuid(cuid) { + logger = LogFactory::getInstance(); + } virtual ~Command() {} virtual bool execute() = 0; diff --git a/src/CopyDiskAdaptor.cc b/src/CopyDiskAdaptor.cc index ca50fab6..489daf29 100644 --- a/src/CopyDiskAdaptor.cc +++ b/src/CopyDiskAdaptor.cc @@ -41,7 +41,7 @@ void CopyDiskAdaptor::fixFilename() { itr != fileEntries.end(); itr++) { if(!itr->extracted && itr->requested) { string dest = storeDir+"/"+itr->path; - //logger->info("writing file %s", dest.c_str()); + logger->info("writing file %s", dest.c_str()); Util::rangedFileCopy(dest, getFilePath(), offset, itr->length); itr->extracted = true; } diff --git a/src/DiskAdaptor.cc b/src/DiskAdaptor.cc index 9f953d4a..5a8e18e0 100644 --- a/src/DiskAdaptor.cc +++ b/src/DiskAdaptor.cc @@ -21,6 +21,18 @@ /* copyright --> */ #include "DiskAdaptor.h" #include "DlAbortEx.h" +#include "LogFactory.h" + +DiskAdaptor::DiskAdaptor(DiskWriter* diskWriter):diskWriter(diskWriter), topDir(NULL) { + logger = LogFactory::getInstance(); +} + +DiskAdaptor::~DiskAdaptor() { + delete diskWriter; + if(topDir != NULL) { + delete topDir; + } +} void DiskAdaptor::openFile() { diskWriter->openFile(getFilePath()); diff --git a/src/DiskAdaptor.h b/src/DiskAdaptor.h index 9e2ba46e..f77fe333 100644 --- a/src/DiskAdaptor.h +++ b/src/DiskAdaptor.h @@ -26,6 +26,7 @@ #include "FileEntry.h" #include "Directory.h" #include "DiskWriter.h" +#include "Logger.h" class DiskAdaptor { protected: @@ -33,15 +34,11 @@ protected: string storeDir; FileEntries fileEntries; const Directory* topDir; + const Logger* logger; virtual string getFilePath() const = 0; public: - DiskAdaptor(DiskWriter* diskWriter):diskWriter(diskWriter), topDir(NULL) {} - virtual ~DiskAdaptor() { - delete diskWriter; - if(topDir != NULL) { - delete topDir; - } - } + DiskAdaptor(DiskWriter* diskWriter); + virtual ~DiskAdaptor(); virtual void openFile(); virtual void closeFile(); diff --git a/src/DownloadCommand.cc b/src/DownloadCommand.cc index a197ccf3..2a2a97d7 100644 --- a/src/DownloadCommand.cc +++ b/src/DownloadCommand.cc @@ -74,7 +74,7 @@ bool DownloadCommand::executeInternal(Segment seg) { || te == NULL && seg.ds >= seg.ep-seg.sp+1 || bufSize == 0) { if(te != NULL) te->end(); - e->logger->info(MSG_DOWNLOAD_COMPLETED, cuid); + logger->info(MSG_DOWNLOAD_COMPLETED, cuid); seg.ds = seg.ep-seg.sp+1; seg.finish = true; e->segmentMan->updateSegment(seg); diff --git a/src/DownloadEngine.cc b/src/DownloadEngine.cc index 1134000f..c1048d9b 100644 --- a/src/DownloadEngine.cc +++ b/src/DownloadEngine.cc @@ -21,6 +21,7 @@ /* copyright --> */ #include "DownloadEngine.h" #include "Util.h" +#include "LogFactory.h" #include <unistd.h> #include <sys/types.h> #include <sys/stat.h> @@ -29,7 +30,9 @@ using namespace std; -DownloadEngine::DownloadEngine():noWait(false), segmentMan(NULL) {} +DownloadEngine::DownloadEngine():noWait(false), segmentMan(NULL) { + logger = LogFactory::getInstance(); +} DownloadEngine::~DownloadEngine() { assert(rsockets.empty()); diff --git a/src/DownloadEngine.h b/src/DownloadEngine.h index 1d65c411..50c81518 100644 --- a/src/DownloadEngine.h +++ b/src/DownloadEngine.h @@ -48,6 +48,7 @@ private: bool addSocket(Sockets& sockets, Socket* socket); bool deleteSocket(Sockets& sockets, Socket* socket); protected: + const Logger* logger; virtual void initStatistics() = 0; virtual void calculateStatistics() = 0; virtual void onEndOfRun() = 0; @@ -57,7 +58,6 @@ public: Commands commands; SegmentMan* segmentMan; DiskWriter* diskWriter; - const Logger* logger; const Option* option; DownloadEngine(); diff --git a/src/FtpConnection.cc b/src/FtpConnection.cc index e265beb1..0f947636 100644 --- a/src/FtpConnection.cc +++ b/src/FtpConnection.cc @@ -25,8 +25,11 @@ #include "DlRetryEx.h" #include "message.h" #include "prefs.h" +#include "LogFactory.h" -FtpConnection::FtpConnection(int cuid, const Socket* socket, const Request* req, const Option* op, const Logger* logger):cuid(cuid), socket(socket), req(req), option(op), logger(logger) {} +FtpConnection::FtpConnection(int cuid, const Socket* socket, const Request* req, const Option* op):cuid(cuid), socket(socket), req(req), option(op) { + logger = LogFactory::getInstance(); +} FtpConnection::~FtpConnection() {} diff --git a/src/FtpConnection.h b/src/FtpConnection.h index 7e37506a..8d91b932 100644 --- a/src/FtpConnection.h +++ b/src/FtpConnection.h @@ -46,7 +46,7 @@ private: bool isEndOfResponse(int status, const string& response) const; bool bulkReceiveResponse(pair<int, string>& response); public: - FtpConnection(int cuid, const Socket* socket, const Request* req, const Option* op, const Logger* logger); + FtpConnection(int cuid, const Socket* socket, const Request* req, const Option* op); ~FtpConnection(); void sendUser() const; void sendPass() const; diff --git a/src/FtpInitiateConnectionCommand.cc b/src/FtpInitiateConnectionCommand.cc index 03af4232..70373ec1 100644 --- a/src/FtpInitiateConnectionCommand.cc +++ b/src/FtpInitiateConnectionCommand.cc @@ -47,9 +47,9 @@ bool FtpInitiateConnectionCommand::executeInternal(Segment segment) { socket = new Socket(); Command* command; if(useHttpProxy()) { - e->logger->info(MSG_CONNECTING_TO_SERVER, cuid, - e->option->get(PREF_HTTP_PROXY_HOST).c_str(), - e->option->getAsInt(PREF_HTTP_PROXY_PORT)); + logger->info(MSG_CONNECTING_TO_SERVER, cuid, + e->option->get(PREF_HTTP_PROXY_HOST).c_str(), + e->option->getAsInt(PREF_HTTP_PROXY_PORT)); socket->establishConnection(e->option->get(PREF_HTTP_PROXY_HOST), e->option->getAsInt(PREF_HTTP_PROXY_PORT)); @@ -62,8 +62,8 @@ bool FtpInitiateConnectionCommand::executeInternal(Segment segment) { throw new DlAbortEx("ERROR"); } } else { - e->logger->info(MSG_CONNECTING_TO_SERVER, cuid, req->getHost().c_str(), - req->getPort()); + logger->info(MSG_CONNECTING_TO_SERVER, cuid, req->getHost().c_str(), + req->getPort()); socket->establishConnection(req->getHost(), req->getPort()); command = new FtpNegotiationCommand(cuid, req, e, socket); } diff --git a/src/FtpNegotiationCommand.cc b/src/FtpNegotiationCommand.cc index 9f19995a..42d202bf 100644 --- a/src/FtpNegotiationCommand.cc +++ b/src/FtpNegotiationCommand.cc @@ -30,7 +30,7 @@ FtpNegotiationCommand::FtpNegotiationCommand(int cuid, Request* req, DownloadEng AbstractCommand(cuid, req, e, s), dataSocket(NULL), serverSocket(NULL), sequence(SEQ_RECV_GREETING) { - ftp = new FtpConnection(cuid, socket, req, e->option, e->logger); + ftp = new FtpConnection(cuid, socket, req, e->option); setReadCheckSocket(NULL); setWriteCheckSocket(socket); } @@ -221,9 +221,9 @@ bool FtpNegotiationCommand::recvPasv() { // make a data connection to the server. dataSocket = new Socket(); - e->logger->info(MSG_CONNECTING_TO_SERVER, cuid, - dest.first.c_str(), - dest.second); + logger->info(MSG_CONNECTING_TO_SERVER, cuid, + dest.first.c_str(), + dest.second); dataSocket->establishConnection(dest.first, dest.second); setReadCheckSocket(NULL); diff --git a/src/FtpTunnelRequestCommand.cc b/src/FtpTunnelRequestCommand.cc index 6146af32..47f3b415 100644 --- a/src/FtpTunnelRequestCommand.cc +++ b/src/FtpTunnelRequestCommand.cc @@ -32,7 +32,7 @@ FtpTunnelRequestCommand::~FtpTunnelRequestCommand() {} bool FtpTunnelRequestCommand::executeInternal(Segment segment) { socket->setBlockingMode(); - HttpConnection httpConnection(cuid, socket, req, e->option, e->logger); + HttpConnection httpConnection(cuid, socket, req, e->option); httpConnection.sendProxyRequest(); FtpTunnelResponseCommand* command = new FtpTunnelResponseCommand(cuid, req, e, socket); diff --git a/src/FtpTunnelResponseCommand.cc b/src/FtpTunnelResponseCommand.cc index 7e44a83c..33489e7f 100644 --- a/src/FtpTunnelResponseCommand.cc +++ b/src/FtpTunnelResponseCommand.cc @@ -25,7 +25,7 @@ #include "message.h" FtpTunnelResponseCommand::FtpTunnelResponseCommand(int cuid, Request* req, DownloadEngine* e, const Socket* s):AbstractCommand(cuid, req, e, s) { - http = new HttpConnection(cuid, socket, req, e->option, e->logger); + http = new HttpConnection(cuid, socket, req, e->option); } FtpTunnelResponseCommand::~FtpTunnelResponseCommand() { diff --git a/src/HttpConnection.cc b/src/HttpConnection.cc index db6b1848..3338b06a 100644 --- a/src/HttpConnection.cc +++ b/src/HttpConnection.cc @@ -25,9 +25,12 @@ #include "Base64.h" #include "message.h" #include "prefs.h" +#include "LogFactory.h" -HttpConnection::HttpConnection(int cuid, const Socket* socket, const Request* req, const Option* op, const Logger* logger): - cuid(cuid), socket(socket), req(req), option(op), logger(logger), headerBufLength(0) {} +HttpConnection::HttpConnection(int cuid, const Socket* socket, const Request* req, const Option* op): + cuid(cuid), socket(socket), req(req), option(op), headerBufLength(0) { + logger = LogFactory::getInstance(); +} void HttpConnection::sendRequest(const Segment& segment) const { string request = createRequest(segment); diff --git a/src/HttpConnection.h b/src/HttpConnection.h index c3e1deba..d340bbcc 100644 --- a/src/HttpConnection.h +++ b/src/HttpConnection.h @@ -29,6 +29,7 @@ #include "Logger.h" #include "HttpHeader.h" #include "common.h" +#include "Logger.h" #include <string> using namespace std; @@ -52,7 +53,7 @@ private: char headerBuf[HEADERBUF_SIZE+1]; int headerBufLength; public: - HttpConnection(int cuid, const Socket* socket, const Request* req, const Option* op, const Logger* logger); + HttpConnection(int cuid, const Socket* socket, const Request* req, const Option* op); /** * Sends Http request. diff --git a/src/HttpInitiateConnectionCommand.cc b/src/HttpInitiateConnectionCommand.cc index f3cdc655..6d7d542a 100644 --- a/src/HttpInitiateConnectionCommand.cc +++ b/src/HttpInitiateConnectionCommand.cc @@ -36,9 +36,9 @@ bool HttpInitiateConnectionCommand::executeInternal(Segment segment) { // socket->establishConnection(...); Command* command; if(useProxy()) { - e->logger->info(MSG_CONNECTING_TO_SERVER, cuid, - e->option->get(PREF_HTTP_PROXY_HOST).c_str(), - e->option->getAsInt(PREF_HTTP_PROXY_PORT)); + logger->info(MSG_CONNECTING_TO_SERVER, cuid, + e->option->get(PREF_HTTP_PROXY_HOST).c_str(), + e->option->getAsInt(PREF_HTTP_PROXY_PORT)); socket->establishConnection(e->option->get(PREF_HTTP_PROXY_HOST), e->option->getAsInt(PREF_HTTP_PROXY_PORT)); if(useProxyTunnel()) { @@ -50,8 +50,8 @@ bool HttpInitiateConnectionCommand::executeInternal(Segment segment) { throw new DlAbortEx("ERROR"); } } else { - e->logger->info(MSG_CONNECTING_TO_SERVER, cuid, req->getHost().c_str(), - req->getPort()); + logger->info(MSG_CONNECTING_TO_SERVER, cuid, req->getHost().c_str(), + req->getPort()); socket->establishConnection(req->getHost(), req->getPort()); command = new HttpRequestCommand(cuid, req, e, socket); } diff --git a/src/HttpProxyRequestCommand.cc b/src/HttpProxyRequestCommand.cc index 196fca31..5a58f8af 100644 --- a/src/HttpProxyRequestCommand.cc +++ b/src/HttpProxyRequestCommand.cc @@ -32,7 +32,7 @@ HttpProxyRequestCommand::~HttpProxyRequestCommand() {} bool HttpProxyRequestCommand::executeInternal(Segment segment) { socket->setBlockingMode(); - HttpConnection httpConnection(cuid, socket, req, e->option, e->logger); + HttpConnection httpConnection(cuid, socket, req, e->option); httpConnection.sendProxyRequest(); HttpProxyResponseCommand* command = new HttpProxyResponseCommand(cuid, req, e, socket); diff --git a/src/HttpProxyResponseCommand.cc b/src/HttpProxyResponseCommand.cc index 9d0949f6..8c26df8e 100644 --- a/src/HttpProxyResponseCommand.cc +++ b/src/HttpProxyResponseCommand.cc @@ -25,7 +25,7 @@ #include "message.h" HttpProxyResponseCommand::HttpProxyResponseCommand(int cuid, Request* req, DownloadEngine* e, const Socket* s):AbstractCommand(cuid, req, e, s) { - http = new HttpConnection(cuid, socket, req, e->option, e->logger); + http = new HttpConnection(cuid, socket, req, e->option); } HttpProxyResponseCommand::~HttpProxyResponseCommand() { diff --git a/src/HttpRequestCommand.cc b/src/HttpRequestCommand.cc index 2ca9455e..4ee43fc1 100644 --- a/src/HttpRequestCommand.cc +++ b/src/HttpRequestCommand.cc @@ -35,7 +35,7 @@ bool HttpRequestCommand::executeInternal(Segment seg) { if(req->getProtocol() == "https") { socket->initiateSecureConnection(); } - HttpConnection http(cuid, socket, req, e->option, e->logger); + HttpConnection http(cuid, socket, req, e->option); // set seg to request in order to remember the request range req->seg = seg; http.sendRequest(seg); diff --git a/src/HttpResponseCommand.cc b/src/HttpResponseCommand.cc index be9826e1..7961f34d 100644 --- a/src/HttpResponseCommand.cc +++ b/src/HttpResponseCommand.cc @@ -32,7 +32,7 @@ HttpResponseCommand::HttpResponseCommand(int cuid, Request* req, DownloadEngine* e, const Socket* s): AbstractCommand(cuid, req, e, s) { - http = new HttpConnection(cuid, socket, req, e->option, e->logger); + http = new HttpConnection(cuid, socket, req, e->option); } HttpResponseCommand::~HttpResponseCommand() { @@ -41,7 +41,7 @@ HttpResponseCommand::~HttpResponseCommand() { bool HttpResponseCommand::executeInternal(Segment seg) { if(req->seg.sp != seg.sp) { - e->logger->info(MSG_SEGMENT_CHANGED, cuid); + logger->info(MSG_SEGMENT_CHANGED, cuid); return prepareForRetry(0); } HttpHeader headers; @@ -86,7 +86,7 @@ void HttpResponseCommand::checkResponse(int status, const Segment& segment) { bool HttpResponseCommand::handleRedirect(string url, const HttpHeader& headers) { req->redirectUrl(url); - e->logger->info(MSG_REDIRECT, cuid, url.c_str()); + logger->info(MSG_REDIRECT, cuid, url.c_str()); e->noWait = true; return prepareForRetry(0); } diff --git a/src/LogFactory.cc b/src/LogFactory.cc new file mode 100644 index 00000000..87d4b0de --- /dev/null +++ b/src/LogFactory.cc @@ -0,0 +1,37 @@ +/* <!-- copyright */ +/* + * aria2 - a simple utility for downloading files faster + * + * Copyright (C) 2006 Tatsuhiro Tsujikawa + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ +/* copyright --> */ +#include "LogFactory.h" +#include "SimpleLogger.h" + +string LogFactory::filename; +Logger* LogFactory::logger = NULL; + +Logger* LogFactory::getInstance() { + if(logger == NULL) { + if(filename.empty()) { + logger = new SimpleLogger("/dev/null"); + } else { + logger = new SimpleLogger(filename); + } + } + return logger; +} diff --git a/src/LogFactory.h b/src/LogFactory.h new file mode 100644 index 00000000..b73dc56b --- /dev/null +++ b/src/LogFactory.h @@ -0,0 +1,47 @@ +/* <!-- copyright */ +/* + * aria2 - a simple utility for downloading files faster + * + * Copyright (C) 2006 Tatsuhiro Tsujikawa + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ +/* copyright --> */ +#ifndef _D_LOG_FACTORY_H_ +#define _D_LOG_FACTORY_H_ + +#include "common.h" +#include "Logger.h" + +class LogFactory { +private: + static string filename; + static Logger* logger; +public: + /** + * Get logger instance. Returned logger is singleton. + * This function is not thread-safe. + */ + static Logger* getInstance(); + + /** + * Set a filename to write log. + */ + static void setLogFile(const string& name) { + filename = name; + } +}; + +#endif // _D_LOG_FACTORY_H_ diff --git a/src/Makefile.am b/src/Makefile.am index b22d7bb4..484a49ed 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -84,7 +84,8 @@ SRCS = Socket.cc Socket.h\ CopyDiskAdaptor.cc CopyDiskAdaptor.h\ DirectDiskAdaptor.cc DirectDiskAdaptor.h\ MultiDiskAdaptor.cc MultiDiskAdaptor.h\ - FileEntry.h + FileEntry.h\ + LogFactory.cc LogFactory.h noinst_LIBRARIES = libaria2c.a libaria2c_a_SOURCES = $(SRCS) aria2c_LDADD = libaria2c.a @LIBINTL@ @ALLOCA@ @LIBGNUTLS_LIBS@\ diff --git a/src/Makefile.in b/src/Makefile.in index 2a3e161c..677e1422 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -100,7 +100,8 @@ am__objects_1 = Socket.$(OBJEXT) SocketCore.$(OBJEXT) \ Directory.$(OBJEXT) TrackerWatcherCommand.$(OBJEXT) \ SendMessageQueue.$(OBJEXT) MultiDiskWriter.$(OBJEXT) \ DiskAdaptor.$(OBJEXT) CopyDiskAdaptor.$(OBJEXT) \ - DirectDiskAdaptor.$(OBJEXT) MultiDiskAdaptor.$(OBJEXT) + DirectDiskAdaptor.$(OBJEXT) MultiDiskAdaptor.$(OBJEXT) \ + LogFactory.$(OBJEXT) am_libaria2c_a_OBJECTS = $(am__objects_1) libaria2c_a_OBJECTS = $(am_libaria2c_a_OBJECTS) am__installdirs = "$(DESTDIR)$(bindir)" @@ -334,7 +335,8 @@ SRCS = Socket.cc Socket.h\ CopyDiskAdaptor.cc CopyDiskAdaptor.h\ DirectDiskAdaptor.cc DirectDiskAdaptor.h\ MultiDiskAdaptor.cc MultiDiskAdaptor.h\ - FileEntry.h + FileEntry.h\ + LogFactory.cc LogFactory.h noinst_LIBRARIES = libaria2c.a libaria2c_a_SOURCES = $(SRCS) @@ -453,6 +455,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/HttpResponseCommand.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/InitiateConnectionCommandFactory.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/List.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LogFactory.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MetaFileUtil.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MultiDiskAdaptor.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MultiDiskWriter.Po@am__quote@ diff --git a/src/PeerAbstractCommand.cc b/src/PeerAbstractCommand.cc index fe164ffa..93a2670e 100644 --- a/src/PeerAbstractCommand.cc +++ b/src/PeerAbstractCommand.cc @@ -22,10 +22,10 @@ #include "PeerAbstractCommand.h" #include "DlAbortEx.h" #include "DlRetryEx.h" -#include <sys/time.h> #include "Util.h" #include "message.h" #include "prefs.h" +#include <sys/time.h> PeerAbstractCommand::PeerAbstractCommand(int cuid, Peer* peer, TorrentDownloadEngine* e, const Socket* s): Command(cuid), e(e), peer(peer), checkSocketIsReadable(false), checkSocketIsWritable(false) { @@ -90,13 +90,13 @@ bool PeerAbstractCommand::execute() { //e->torrentMan->updatePeer(peer); return returnValue; } catch(Exception* err) { - e->logger->error(MSG_DOWNLOAD_ABORTED, err, cuid); + logger->error(MSG_DOWNLOAD_ABORTED, err, cuid); onAbort(err); delete(err); return prepareForNextPeer(0); } /*catch(DlRetryEx* err) { - e->logger->error(MSG_RESTARTING_DOWNLOAD, err, cuid); + logger->error(MSG_RESTARTING_DOWNLOAD, err, cuid); peer->tryCount++; bool isAbort = e->option->getAsInt(PREF_MAX_TRIES) != 0 && peer->tryCount >= e->option->getAsInt(PREF_MAX_TRIES); @@ -106,7 +106,7 @@ bool PeerAbstractCommand::execute() { } delete(err); if(isAbort) { - e->logger->error(MSG_MAX_TRY, cuid, tryCount); + logger->error(MSG_MAX_TRY, cuid, tryCount); return true; } else { return prepareForRetry(e->option->getAsInt(PREF_RETRY_WAIT)); @@ -136,7 +136,7 @@ void PeerAbstractCommand::onAbort(Exception* ex) { peer->amInterested = false; peer->peerChoking = true; peer->peerInterested = false; - e->logger->debug("CUID#%d - peer %s:%d banned.", cuid, peer->ipaddr.c_str(), peer->port); + logger->debug("CUID#%d - peer %s:%d banned.", cuid, peer->ipaddr.c_str(), peer->port); } void PeerAbstractCommand::setReadCheckSocket(Socket* socket) { diff --git a/src/PeerConnection.cc b/src/PeerConnection.cc index 82484d06..e5853a98 100644 --- a/src/PeerConnection.cc +++ b/src/PeerConnection.cc @@ -24,14 +24,17 @@ #include "DlAbortEx.h" #include "PeerMessageUtil.h" #include "Util.h" +#include "LogFactory.h" #include <netinet/in.h> PeerConnection::PeerConnection(int cuid, const Socket* socket, - const Option* op, const Logger* logger, + const Option* op, Peer* peer, TorrentMan* torrentMan) :cuid(cuid), socket(socket), option(op), logger(logger), peer(peer), torrentMan(torrentMan), - resbufLength(0), currentPayloadLength(0), lenbufLength(0) {} + resbufLength(0), currentPayloadLength(0), lenbufLength(0) { + logger = LogFactory::getInstance(); +} PeerConnection::~PeerConnection() {} diff --git a/src/PeerConnection.h b/src/PeerConnection.h index 9c8401e7..5dcca90b 100644 --- a/src/PeerConnection.h +++ b/src/PeerConnection.h @@ -57,7 +57,7 @@ private: void writeOutgoingMessageLog(const char* msg, int index, int begin, int length) const; public: PeerConnection(int cuid, const Socket* socket, const Option* op, - const Logger* logger, Peer* peer, TorrentMan* torrenMan); + Peer* peer, TorrentMan* torrenMan); ~PeerConnection(); void sendHandshake() const; diff --git a/src/PeerInitiateConnectionCommand.cc b/src/PeerInitiateConnectionCommand.cc index 3671d67e..d77b54a1 100644 --- a/src/PeerInitiateConnectionCommand.cc +++ b/src/PeerInitiateConnectionCommand.cc @@ -38,8 +38,8 @@ bool PeerInitiateConnectionCommand::executeInternal() { // socket->establishConnection(...); Command* command; - e->logger->info(MSG_CONNECTING_TO_SERVER, cuid, peer->ipaddr.c_str(), - peer->port); + logger->info(MSG_CONNECTING_TO_SERVER, cuid, peer->ipaddr.c_str(), + peer->port); socket->establishConnection(peer->ipaddr, peer->port); command = new PeerInteractionCommand(cuid, peer, e, socket, PeerInteractionCommand::INITIATOR_SEND_HANDSHAKE); diff --git a/src/PeerInteractionCommand.cc b/src/PeerInteractionCommand.cc index 2015f21b..b423ca77 100644 --- a/src/PeerInteractionCommand.cc +++ b/src/PeerInteractionCommand.cc @@ -37,10 +37,8 @@ PeerInteractionCommand::PeerInteractionCommand(int cuid, Peer* peer, setWriteCheckSocket(socket); setTimeout(e->option->getAsInt(PREF_PEER_CONNECTION_TIMEOUT)); } - peerConnection = new PeerConnection(cuid, socket, e->option, e->logger, - peer, e->torrentMan); - sendMessageQueue = new SendMessageQueue(cuid, peerConnection, e->torrentMan, - e->logger); + peerConnection = new PeerConnection(cuid, socket, e->option, peer, e->torrentMan); + sendMessageQueue = new SendMessageQueue(cuid, peerConnection, e->torrentMan); piece = Piece::nullPiece; keepAliveCheckPoint.tv_sec = 0; keepAliveCheckPoint.tv_usec = 0; @@ -78,9 +76,9 @@ bool PeerInteractionCommand::executeInternal() { break; } peer->setPeerId(handshakeMessage->peerId); - e->logger->info(MSG_RECEIVE_PEER_MESSAGE, cuid, - peer->ipaddr.c_str(), peer->port, - handshakeMessage->toString().c_str()); + logger->info(MSG_RECEIVE_PEER_MESSAGE, cuid, + peer->ipaddr.c_str(), peer->port, + handshakeMessage->toString().c_str()); delete handshakeMessage; if(e->torrentMan->getDownloadLength() > 0) { peerConnection->sendBitfield(); @@ -94,9 +92,9 @@ bool PeerInteractionCommand::executeInternal() { break; } peer->setPeerId(handshakeMessage->peerId); - e->logger->info(MSG_RECEIVE_PEER_MESSAGE, cuid, - peer->ipaddr.c_str(), peer->port, - handshakeMessage->toString().c_str()); + logger->info(MSG_RECEIVE_PEER_MESSAGE, cuid, + peer->ipaddr.c_str(), peer->port, + handshakeMessage->toString().c_str()); delete handshakeMessage; peerConnection->sendHandshake(); if(e->torrentMan->getDownloadLength() > 0) { @@ -217,9 +215,9 @@ void PeerInteractionCommand::receiveMessage() { if(message == NULL) { return; } - e->logger->info(MSG_RECEIVE_PEER_MESSAGE, cuid, - peer->ipaddr.c_str(), peer->port, - message->toString().c_str()); + logger->info(MSG_RECEIVE_PEER_MESSAGE, cuid, + peer->ipaddr.c_str(), peer->port, + message->toString().c_str()); try { switch(message->getId()) { case PeerMessage::KEEP_ALIVE: @@ -272,16 +270,16 @@ void PeerInteractionCommand::receiveMessage() { if(!Piece::isNull(piece) && !RequestSlot::isNull(slot)) { long long int offset = ((long long int)message->getIndex())*e->torrentMan->pieceLength+message->getBegin(); - e->logger->debug("CUID#%d - write block length = %d, offset=%lld", - cuid, message->getBlockLength(), offset); + logger->debug("CUID#%d - write block length = %d, offset=%lld", + cuid, message->getBlockLength(), offset); e->torrentMan->diskAdaptor->writeData(message->getBlock(), message->getBlockLength(), offset); piece.completeBlock(slot.getBlockIndex()); sendMessageQueue->deleteRequestSlot(slot); e->torrentMan->updatePiece(piece); - e->logger->debug("CUID#%d - setting piece bit index=%d", cuid, - slot.getBlockIndex()); + logger->debug("CUID#%d - setting piece bit index=%d", cuid, + slot.getBlockIndex()); e->torrentMan->addDeltaDownloadLength(message->getBlockLength()); if(piece.pieceComplete()) { if(checkPieceHash(piece)) { @@ -302,14 +300,14 @@ void PeerInteractionCommand::receiveMessage() { } void PeerInteractionCommand::onGotNewPiece() { - e->logger->info(MSG_GOT_NEW_PIECE, cuid, piece.getIndex()); + logger->info(MSG_GOT_NEW_PIECE, cuid, piece.getIndex()); e->torrentMan->completePiece(piece); e->torrentMan->advertisePiece(cuid, piece.getIndex()); piece = Piece::nullPiece; } void PeerInteractionCommand::onGotWrongPiece() { - e->logger->error(MSG_GOT_WRONG_PIECE, cuid, piece.getIndex()); + logger->error(MSG_GOT_WRONG_PIECE, cuid, piece.getIndex()); erasePieceOnDisk(piece); piece.clearAllBlock(); e->torrentMan->updatePiece(piece); @@ -336,12 +334,12 @@ Piece PeerInteractionCommand::getNewPieceAndSendInterest() { sendMessageQueue->cancelAllRequest(); Piece piece = e->torrentMan->getMissingPiece(peer); if(Piece::isNull(piece)) { - e->logger->debug("CUID#%d - try to send not-interested", cuid); + logger->debug("CUID#%d - try to send not-interested", cuid); PendingMessage pendingMessage(PeerMessage::NOT_INTERESTED, peerConnection); sendMessageQueue->addPendingMessage(pendingMessage); } else { - e->logger->debug("CUID#%d - starting download for piece index=%d", cuid, piece.getIndex()); - e->logger->debug("CUID#%d - try to send interested", cuid); + logger->debug("CUID#%d - starting download for piece index=%d", cuid, piece.getIndex()); + logger->debug("CUID#%d - try to send interested", cuid); PendingMessage pendingMessage(PeerMessage::INTERESTED, peerConnection); sendMessageQueue->addPendingMessage(pendingMessage); } diff --git a/src/PeerListenCommand.cc b/src/PeerListenCommand.cc index 65573a77..0b641bce 100644 --- a/src/PeerListenCommand.cc +++ b/src/PeerListenCommand.cc @@ -23,8 +23,7 @@ #include "PeerInteractionCommand.h" PeerListenCommand::PeerListenCommand(int cuid, TorrentDownloadEngine* e) - :Command(cuid), e(e), socket(NULL) { -} + :Command(cuid), e(e), socket(NULL) {} PeerListenCommand::~PeerListenCommand() { if(socket != NULL) { @@ -40,12 +39,12 @@ int PeerListenCommand::bindPort(int portRangeStart, int portRangeEnd) { try { socket = new Socket(); socket->beginListen(port); - e->logger->info("CUID#%d - using port %d for accepting new connections", - cuid, port); + logger->info("CUID#%d - using port %d for accepting new connections", + cuid, port); return port; } catch(Exception* ex) { - e->logger->error("CUID#%d - an error occurred while binding port=%d", - ex, cuid, port); + logger->error("CUID#%d - an error occurred while binding port=%d", + ex, cuid, port); delete ex; delete socket; socket = NULL; @@ -75,14 +74,14 @@ bool PeerListenCommand::execute() { new PeerInteractionCommand(newCuid, peer, e, peerSocket, PeerInteractionCommand::RECEIVER_WAIT_HANDSHAKE); e->commands.push(command); - e->logger->debug("CUID#%d - incoming connection, adding new command CUID#%d", cuid, newCuid); + logger->debug("CUID#%d - incoming connection, adding new command CUID#%d", cuid, newCuid); } else { delete peer; } } delete peerSocket; } catch(Exception* ex) { - e->logger->error("CUID#%d - error in accepting connection", ex, cuid); + logger->error("CUID#%d - error in accepting connection", ex, cuid); delete ex; if(peerSocket != NULL) { delete peerSocket; diff --git a/src/PeerListenCommand.h b/src/PeerListenCommand.h index e2162234..c4a33e68 100644 --- a/src/PeerListenCommand.h +++ b/src/PeerListenCommand.h @@ -29,7 +29,6 @@ class PeerListenCommand : public Command { private: TorrentDownloadEngine* e; Socket* socket; - public: PeerListenCommand(int cuid, TorrentDownloadEngine* e); ~PeerListenCommand(); diff --git a/src/RequestSlotMan.cc b/src/RequestSlotMan.cc index 42324867..73b3e63c 100644 --- a/src/RequestSlotMan.cc +++ b/src/RequestSlotMan.cc @@ -20,6 +20,19 @@ */ /* copyright --> */ #include "RequestSlotMan.h" +#include "LogFactory.h" + +RequestSlotMan::RequestSlotMan(int cuid, + PendingMessages* pendingMessages, + PeerConnection* peerConnection, + TorrentMan* torrentMan): + cuid(cuid), + timeout(DEFAULT_TIME_OUT), + pendingMessages(pendingMessages), + peerConnection(peerConnection), + torrentMan(torrentMan) { + logger = LogFactory::getInstance(); +} void RequestSlotMan::addRequestSlot(const RequestSlot& requestSlot) { requestSlots.push_back(requestSlot); diff --git a/src/RequestSlotMan.h b/src/RequestSlotMan.h index 9815d7c6..4bf5596b 100644 --- a/src/RequestSlotMan.h +++ b/src/RequestSlotMan.h @@ -48,10 +48,7 @@ public: RequestSlotMan(int cuid, PendingMessages* pendingMessages, PeerConnection* peerConnection, - TorrentMan* torrentMan, - const Logger* logger):cuid(cuid), timeout(DEFAULT_TIME_OUT), - pendingMessages(pendingMessages), peerConnection(peerConnection), - torrentMan(torrentMan), logger(logger) {} + TorrentMan* torrentMan); ~RequestSlotMan() {} void addRequestSlot(const RequestSlot& requestSlot); diff --git a/src/SegmentMan.cc b/src/SegmentMan.cc index c2761796..8dca9306 100644 --- a/src/SegmentMan.cc +++ b/src/SegmentMan.cc @@ -21,16 +21,19 @@ /* copyright --> */ #include "SegmentMan.h" #include "DlAbortEx.h" -#include <sys/types.h> -#include <sys/stat.h> -#include <unistd.h> -#include <errno.h> #include "Util.h" #include "File.h" #include "message.h" #include "prefs.h" +#include "LogFactory.h" +#include <sys/types.h> +#include <sys/stat.h> +#include <unistd.h> +#include <errno.h> -SegmentMan::SegmentMan():totalSize(0),isSplittable(true),downloadStarted(false),dir(".") {} +SegmentMan::SegmentMan():totalSize(0),isSplittable(true),downloadStarted(false),dir(".") { + logger = LogFactory::getInstance(); +} SegmentMan::~SegmentMan() {} diff --git a/src/SegmentMan.h b/src/SegmentMan.h index 857a38f7..24eaf061 100644 --- a/src/SegmentMan.h +++ b/src/SegmentMan.h @@ -37,6 +37,8 @@ using namespace std; */ class SegmentMan { private: + const Logger* logger; + void read(FILE* file); FILE* openSegFile(string segFilename, string mode) const; public: @@ -81,7 +83,6 @@ public: */ string ufilename; - const Logger* logger; const Option* option; SegmentSplitter* splitter; diff --git a/src/SegmentSplitter.cc b/src/SegmentSplitter.cc index 774f65bb..1dc42f75 100644 --- a/src/SegmentSplitter.cc +++ b/src/SegmentSplitter.cc @@ -21,6 +21,11 @@ /* copyright --> */ #include "SegmentSplitter.h" #include "Util.h" +#include "LogFactory.h" + +SegmentSplitter::SegmentSplitter() { + logger = LogFactory::getInstance(); +} void SegmentSplitter::split(Segment& seg, int cuid, Segment& s) const { long long int nep = (s.ep-(s.sp+s.ds))/2+(s.sp+s.ds); diff --git a/src/SegmentSplitter.h b/src/SegmentSplitter.h index c12ed9b0..106fe089 100644 --- a/src/SegmentSplitter.h +++ b/src/SegmentSplitter.h @@ -29,11 +29,11 @@ class SegmentSplitter { protected: long long int minSegmentSize; + const Logger* logger; void split(Segment& seg, int cuid, Segment& s) const; public: - const Logger* logger; - + SegmentSplitter(); virtual ~SegmentSplitter() {} virtual bool splitSegment(Segment& newSegment, int cuid, Segments& segments) = 0; void setMinSegmentSize(long long int size) { minSegmentSize = size; } diff --git a/src/SendMessageQueue.cc b/src/SendMessageQueue.cc index 69e44b25..d3483bfa 100644 --- a/src/SendMessageQueue.cc +++ b/src/SendMessageQueue.cc @@ -20,13 +20,14 @@ */ /* copyright --> */ #include "SendMessageQueue.h" +#include "LogFactory.h" SendMessageQueue::SendMessageQueue(int cuid, PeerConnection* peerConnection, - TorrentMan* torrentMan, - const Logger* logger) - :cuid(cuid), logger(logger) { + TorrentMan* torrentMan) + :cuid(cuid) { requestSlotMan = new RequestSlotMan(cuid, &pendingMessages, peerConnection, - torrentMan, logger); + torrentMan); + logger = LogFactory::getInstance(); } SendMessageQueue::~SendMessageQueue() { diff --git a/src/SendMessageQueue.h b/src/SendMessageQueue.h index 0d0c58c7..41975e6b 100644 --- a/src/SendMessageQueue.h +++ b/src/SendMessageQueue.h @@ -33,7 +33,7 @@ private: const Logger* logger; public: SendMessageQueue(int cuid, PeerConnection* peerConnection, - TorrentMan* torrentMan, const Logger* logger); + TorrentMan* torrentMan); ~SendMessageQueue(); void send(); diff --git a/src/TorrentMan.cc b/src/TorrentMan.cc index 9c8f06a0..181bf6bb 100644 --- a/src/TorrentMan.cc +++ b/src/TorrentMan.cc @@ -35,6 +35,7 @@ #include "CopyDiskAdaptor.h" #include "DirectDiskAdaptor.h" #include "MultiDiskAdaptor.h" +#include "LogFactory.h" #include <errno.h> #include <libgen.h> #include <string.h> @@ -49,7 +50,9 @@ TorrentMan::TorrentMan():bitfield(NULL), interval(DEFAULT_ANNOUNCE_INTERVAL), minInterval(DEFAULT_ANNOUNCE_MIN_INTERVAL), complete(0), incomplete(0), - connections(0), diskAdaptor(NULL) {} + connections(0), diskAdaptor(NULL) { + logger = LogFactory::getInstance(); +} TorrentMan::~TorrentMan() { if(bitfield != NULL) { diff --git a/src/TorrentMan.h b/src/TorrentMan.h index 9f6fe618..8452e5eb 100644 --- a/src/TorrentMan.h +++ b/src/TorrentMan.h @@ -73,6 +73,7 @@ private: Haves haves; UsedPieces usedPieces; bool setupComplete; + const Logger* logger; FILE* openSegFile(string segFilename, string mode) const; void read(FILE* file); @@ -100,7 +101,6 @@ public: TorrentMan(); ~TorrentMan(); - const Logger* logger; DiskAdaptor* diskAdaptor; const Option* option; diff --git a/src/TrackerDownloadCommand.cc b/src/TrackerDownloadCommand.cc index e452b6ae..da3aa843 100644 --- a/src/TrackerDownloadCommand.cc +++ b/src/TrackerDownloadCommand.cc @@ -76,7 +76,7 @@ bool TrackerDownloadCommand::executeInternal(Segment seg) { || te == NULL && len == e->segmentMan->totalSize || bufSize == 0) { if(te != NULL) te->end(); - e->logger->info(MSG_DOWNLOAD_COMPLETED, cuid); + logger->info(MSG_DOWNLOAD_COMPLETED, cuid); MetaEntry* entry = MetaFileUtil::bdecoding(res, len); e->commands.push(new TrackerUpdateCommand(cuid, req, (TorrentDownloadEngine*)e, entry)); return true; 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); diff --git a/src/TrackerWatcherCommand.cc b/src/TrackerWatcherCommand.cc index c14e71ee..f622a52a 100644 --- a/src/TrackerWatcherCommand.cc +++ b/src/TrackerWatcherCommand.cc @@ -25,7 +25,8 @@ TrackerWatcherCommand::TrackerWatcherCommand(int cuid, Request* req, TorrentDownloadEngine* e): - Command(cuid), req(req), e(e) {} + Command(cuid), req(req), e(e) { +} TrackerWatcherCommand::~TrackerWatcherCommand() {} @@ -34,8 +35,8 @@ bool TrackerWatcherCommand::execute() { Command* command = new TrackerInitCommand(e->torrentMan->getNewCuid(), req, e); - e->logger->info("CUID#%d - creating new tracker request command #%d", cuid, - command->getCuid()); + logger->info("CUID#%d - creating new tracker request command #%d", cuid, + command->getCuid()); e->commands.push(command); SleepCommand* slpCommand = new SleepCommand(cuid, e, this, diff --git a/src/main.cc b/src/main.cc index 69fab73a..d20f56e2 100644 --- a/src/main.cc +++ b/src/main.cc @@ -25,7 +25,7 @@ #include "SegmentMan.h" #include "TorrentMan.h" #include "SplitSlowestSegmentSplitter.h" -#include "SimpleLogger.h" +#include "LogFactory.h" #include "common.h" #include "DefaultDiskWriter.h" #include "Util.h" @@ -533,14 +533,12 @@ int main(int argc, char* argv[]) { gnutls_global_init(); #endif // HAVE_LIBGNUTLS srandom(time(NULL)); - SimpleLogger* logger; if(stdoutLog) { - logger = new SimpleLogger(stdout); + LogFactory::setLogFile("/dev/stdout"); } else if(logfile.size()) { - logger = new SimpleLogger(logfile); - } else { - logger = new SimpleLogger("/dev/null"); + LogFactory::setLogFile(logfile); } + SegmentSplitter* splitter = new SplitSlowestSegmentSplitter(); splitter->setMinSegmentSize(op->getAsLLInt(PREF_MIN_SEGMENT_SIZE)); @@ -552,15 +550,12 @@ int main(int argc, char* argv[]) { setSignalHander(SIGINT, handler); setSignalHander(SIGTERM, handler); - splitter->logger = logger; e = new ConsoleDownloadEngine(); - e->logger = logger; e->option = op; e->diskWriter = new DefaultDiskWriter(); e->segmentMan = new SegmentMan(); e->segmentMan->dir = dir; e->segmentMan->ufilename = ufilename; - e->segmentMan->logger = logger; e->segmentMan->option = op; e->segmentMan->splitter = splitter; @@ -601,16 +596,13 @@ int main(int argc, char* argv[]) { req->isTorrent = true; req->setTrackerEvent(Request::STARTED); te = new TorrentConsoleDownloadEngine(); - te->logger = logger; te->option = op; te->diskWriter = new DefaultDiskWriter(); te->segmentMan = new SegmentMan(); - te->segmentMan->logger = logger; te->segmentMan->option = op; te->segmentMan->splitter = splitter; te->torrentMan = new TorrentMan(); te->torrentMan->setStoreDir(dir); - te->torrentMan->logger = logger; te->torrentMan->option = op; string targetTorrentFile = torrentFile.empty() ? downloadedTorrentFile : torrentFile; @@ -662,11 +654,9 @@ int main(int argc, char* argv[]) { exit(1); } } - - delete(logger); delete(op); delete(splitter); - + delete(LogFactory::getInstance()); #ifdef HAVE_LIBGNUTLS gnutls_global_deinit(); #endif // HAVE_LIBGNUTLS |