diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2007-11-12 14:13:00 +0000 |
|---|---|---|
| committer | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2007-11-12 14:13:00 +0000 |
| commit | aef50efed072fd7bbbcceae8fdfde7f0570a1a40 (patch) | |
| tree | a5848d2943968c578790ddf05eb2b20f3c1fa73e /src/TrackerWatcherCommand.cc | |
| parent | 7c41d11be325a2f85108a28a2111353ad0e208b4 (diff) | |
2007-11-12 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>
Do not rotate tiers in announce-list.
* src/DefaultBtAnnounce.{h, cc}: Removed trackerNumTry.
AnnounceList::allTiersFailed() used instead to detect whether
all
tiers are tried and failed.
* test/DefaultBtAnnounceTest.cc
* src/AnnounceList.{h, cc}: If all tiers are tried and failed
then
allTiersFailed() returns true. To reset tier pointer, call
resetTier();
* test/AnnounceListTest.cc
* src/TrackerWatcherCommand.cc (execute): Removed DlAbortEx
catch
clause. Catch RecoverableException instead of DlRetryEx instead.
Diffstat (limited to 'src/TrackerWatcherCommand.cc')
| -rw-r--r-- | src/TrackerWatcherCommand.cc | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/TrackerWatcherCommand.cc b/src/TrackerWatcherCommand.cc index 043df899..66f6d06f 100644 --- a/src/TrackerWatcherCommand.cc +++ b/src/TrackerWatcherCommand.cc @@ -71,8 +71,6 @@ bool TrackerWatcherCommand::execute() { if(_trackerRequestGroup.isNull()) { _trackerRequestGroup = createAnnounce(); if(!_trackerRequestGroup.isNull()) { - //e->_requestGroupMan->addReservedGroup(_trackerRequestGroup); - //e->_requestGroupMan->fillRequestGroupFromReserver(e); e->addCommand(_trackerRequestGroup->createInitialCommand(e)); logger->debug("added tracker request command"); } @@ -83,13 +81,7 @@ bool TrackerWatcherCommand::execute() { processTrackerResponse(trackerResponse); btAnnounce->announceSuccess(); btAnnounce->resetAnnounce(); - } catch(DlAbortEx* ex) { - logger->error(EX_EXCEPTION_CAUGHT, ex); - delete ex; - btAnnounce->announceFailure(); - btAnnounce->resetAnnounce(); - } catch(DlRetryEx* ex) { - // TODO Can I remove this catch clause? + } catch(RecoverableException* ex) { logger->error(EX_EXCEPTION_CAUGHT, ex); delete ex; btAnnounce->announceFailure(); |