Changeset 9429

Timestamp:

Oct 28, 2009, 4:53:39 AM (13 years ago)

Author:

charles

Message:

(trunk libT) #2530: Announce attempt to invalid tracker occurs too often

File:

• trunk/libtransmission/announcer.c (modified) (6 diffs)

trunk/libtransmission/announcer.c

@@ -1207 +1207 @@
                         sizeof( tier->lastAnnounceStr ) );
 
+            tier->lastAnnounceTime = now;
+
             /* if the response is serious, *and* if the response may require
              * human intervention, then notify the user... otherwise just log it */
@@ -1270 +1272 @@
                 publishErrorMessageAndStop( tier, _( "Tracker returned a 4xx message" ) );
             tier->manualAnnounceAllowedAt = ~(time_t)0;
+            tierClearNextAnnounce( tier );
         }
         else if( 500 <= responseCode && responseCode <= 599 )
@@ -1477 +1480 @@
             const int interval = tier->retryScrapeIntervalSec;
             tier->retryScrapeIntervalSec *= 2;
-            tier->scrapeAt = now + interval;
+
+            /* Don't retry on a 4xx.
+             * Retry at growing intervals on a 5xx */
+            if( 400 <= responseCode && responseCode <= 499 )
+                tier->scrapeAt = 0;
+            else
+                tier->scrapeAt = now + interval;
 
             /* %1$ld - http status code, such as 404
@@ -1559 +1568 @@
 {
     return !tier->isScraping
+        && ( tier->scrapeAt != 0 )
         && ( tier->scrapeAt <= now )
         && ( tier->currentTracker != NULL )
@@ -1712 +1722 @@
                 if( tier->isScraping )
                     st->scrapeState = TR_TRACKER_ACTIVE;
+                else if( !tier->scrapeAt )
+                    st->scrapeState = TR_TRACKER_INACTIVE;
                 else if( tier->scrapeAt > now )
                 {
@@ -1732 +1744 @@
                 if( tier->isAnnouncing )
                     st->announceState = TR_TRACKER_ACTIVE;
-                else if( !torrent->isRunning )
+                else if( !torrent->isRunning || !tier->announceAt )
                     st->announceState = TR_TRACKER_INACTIVE;
                 else if( tier->announceAt > now )