Changeset 8893

Timestamp:

Aug 11, 2009, 9:31:33 PM (12 years ago)

Author:

charles

Message:

(trunk libT) #2211: Behaviour when tracker barfs

Location:

trunk

Files:

• configure.ac (modified) (1 diff)
• libtransmission/tracker.c (modified) (12 diffs)
• libtransmission/transmission.h (modified) (1 diff)

trunk/configure.ac

@@ -308 +308 @@
 if test "x$enable_nls" = "xyes" ; then
     use_nls=yes
-    IT_PROG_INTLTOOL([0.40.0],[no-xml])
+    IT_PROG_INTLTOOL([0.35.0],[no-xml])
     AC_CHECK_HEADERS([libintl.h])
     GETTEXT_PACKAGE=transmission

trunk/libtransmission/tracker.c

@@ -49 +49 @@
 
     /* unless the tracker says otherwise, this is the announce interval */
-    DEFAULT_ANNOUNCE_INTERVAL_SEC = ( 60 * 4 ),
+    DEFAULT_ANNOUNCE_INTERVAL_SEC = ( 60 * 10 ),
 
     /* unless the tracker says otherwise, this is the announce min_interval */
@@ -123 +123 @@
 
     time_t    lastScrapeTime;
-    long      lastScrapeResponse;
+    char      lastScrapeStr[128];
 
     time_t    lastAnnounceTime;
-    long      lastAnnounceResponse;
+    char      lastAnnounceStr[128];
 };
 
@@ -421 +421 @@
     dbgmsg( t->name, "tracker response: %ld", responseCode );
     tr_ndbg( t->name, "tracker response: %ld", responseCode );
-    t->lastAnnounceResponse = responseCode;
+    t->lastAnnounceStr[0] = '\0';
 
     if( responseCode == HTTP_OK )
@@ -443 +443 @@
             if( tr_bencDictFindStr( &benc, "failure reason", &str ) )
             {
+                tr_strlcpy( t->lastAnnounceStr, str, sizeof( t->lastAnnounceStr ) );
                 publishMessage( t, str, TR_TRACKER_ERROR );
                 success = FALSE;
@@ -448 +449 @@
 
             if( tr_bencDictFindStr( &benc, "warning message", &str ) )
+            {
+                tr_strlcpy( t->lastAnnounceStr, str, sizeof( t->lastAnnounceStr ) );
                 publishWarning( t, str );
+            }
 
             if( tr_bencDictFindInt( &benc, "interval", &i ) )
@@ -505 +509 @@
                 publishNewPeersCompact6( t, allAreSeeds, raw, rawlen );
             }
+
+            if( !*t->lastAnnounceStr )
+                tr_strlcpy( t->lastAnnounceStr, _( "Success" ), sizeof( t->lastAnnounceStr ) );
         }
 
@@ -514 +521 @@
         /* %1$ld - http status code, such as 404
          * %2$s - human-readable explanation of the http status code */
-        char * buf = tr_strdup_printf( _( "Tracker request failed.  Got HTTP Status Code %1$ld (%2$s)" ),
+        char * buf = tr_strdup_printf( _( "Announce failed: tracker gave HTTP Response Code %1$ld (%2$s)" ),
                                       responseCode,
                                       tr_webGetResponseStr( responseCode ) );
+        tr_strlcpy( t->lastAnnounceStr, buf, sizeof( t->lastAnnounceStr ) );
         publishWarning( t, buf );
         tr_free( buf );
+    }
+    else
+    {
+        tr_strlcpy( t->lastAnnounceStr, _( "Announce failed: tracker did not respond." ), sizeof( t->lastAnnounceStr ) );
     }
 
@@ -541 +553 @@
            treat this as both a successful announce AND scrape. */
         if( scrapeFields >= 3 ) {
-            t->lastScrapeResponse = responseCode;
             t->lastScrapeTime = now;
             t->scrapeAt = now + t->scrapeIntervalSec + t->randOffset;
@@ -610 +621 @@
     dbgmsg( t->name, "scrape response: %ld\n", responseCode );
     tr_ndbg( t->name, "scrape response: %ld", responseCode );
-    t->lastScrapeResponse = responseCode;
+    t->lastScrapeStr[0] = '\0';
 
     if( responseCode == HTTP_OK )
@@ -678 +689 @@
     {
         const int interval = t->scrapeIntervalSec + t->randOffset;
-        dbgmsg( t->name, "Request succeeded. Rescraping in %d seconds",
-                interval );
-        tr_ndbg( t->name, "Request succeeded. Rescraping in %d seconds",
-                 interval );
         t->scrapeAt = time( NULL ) + interval;
+
+        tr_strlcpy( t->lastScrapeStr, _( "Success" ), sizeof( t->lastScrapeStr ) );
+        tr_ndbg( t->name, "Request succeeded. Rescraping in %d seconds", interval );
     }
     else if( 300 <= responseCode && responseCode <= 399 )
     {
         const int interval = 5;
-        dbgmsg( t->name, "Got a redirect. Retrying in %d seconds", interval );
         t->scrapeAt = time( NULL ) + interval;
+
+        tr_snprintf( t->lastScrapeStr, sizeof( t->lastScrapeStr ), "Got a redirect. Retrying in %d seconds", interval );
+        tr_ndbg( t->name, "%s", t->lastScrapeStr );
     }
     else
     {
         const int interval = t->retryScrapeIntervalSec + t->randOffset;
-        dbgmsg(
-            t->name,
-            "Tracker responded to scrape with %ld. Retrying in %d seconds.",
-            responseCode,  interval );
         t->retryScrapeIntervalSec *= 2;
         t->scrapeAt = time( NULL ) + interval;
-    }
+
+        /* %1$ld - http status code, such as 404
+         * %2$s - human-readable explanation of the http status code */
+        if( !responseCode )
+            tr_strlcpy( t->lastScrapeStr, _( "Scrape failed: tracker did not respond." ), sizeof( t->lastScrapeStr ) );
+        else
+            tr_snprintf( t->lastScrapeStr, sizeof( t->lastScrapeStr ),
+                         _( "Scrape failed: tracker gave HTTP Response Code %1$ld (%2$s)" ),
+                         responseCode, tr_webGetResponseStr( responseCode ) );
+    }
+
+    dbgmsg( t->name, "%s", t->lastScrapeStr );
 }
 
@@ -1079 +1098 @@
     t->downloaderCount          = -1;
     t->leecherCount             = -1;
-    t->lastAnnounceResponse     = -1;
-    t->lastScrapeResponse       = -1;
     t->manualAnnounceAllowedAt  = ~(time_t)0;
     t->name                     = tr_strdup( info->name );
@@ -1240 +1257 @@
     setme->nextAnnounceTime = t->reannounceAt;
     setme->manualAnnounceTime = t->manualAnnounceAllowedAt;
-
-    if( t->lastScrapeResponse == -1 ) /* never been scraped */
-        *setme->scrapeResponse = '\0';
-    else
-        tr_snprintf( setme->scrapeResponse,
-                     sizeof( setme->scrapeResponse ),
-                     "%s (%ld)",
-                     tr_webGetResponseStr( t->lastScrapeResponse ),
-                     t->lastScrapeResponse );
-
-    if( t->lastAnnounceResponse == -1 ) /* never been announced */
-        *setme->announceResponse = '\0';
-    else
-        tr_snprintf( setme->announceResponse,
-                     sizeof( setme->announceResponse ),
-                     "%s (%ld)",
-                     tr_webGetResponseStr( t->lastAnnounceResponse ),
-                     t->lastAnnounceResponse );
-}
-
+    tr_strlcpy( setme->scrapeResponse, t->lastScrapeStr, sizeof( setme->scrapeResponse ) );
+    tr_strlcpy( setme->announceResponse, t->lastAnnounceStr, sizeof( setme->announceResponse ) );
+}

trunk/libtransmission/transmission.h

@@ -1530 +1530 @@
     uint64_t    haveUnchecked;
 
-    /** This is the unmodified string returned by the tracker in response
-        to the torrent's most recent scrape request.  If no request was
-        sent or there was no response, this string is empty. */
-    char    scrapeResponse[64];
-
-    /** The unmodified string returned by the tracker in response
-        to the torrent's most recent scrape request.  If no request was
-        sent or there was no response, this string is empty. */
-    char    announceResponse[64];
+    /**
+     * This is a human-readable string with the last scrape's results. 
+     * 1. If an http error occurred, the response code and description is given.
+     * 2. If the tracker gave an error or warning messae, that is given.
+     * 3. If everything went fine, "Success" is given.
+     */
+    char    scrapeResponse[128];
+
+    /** This is a human-readable string with the last announce's results.
+        Its contents have the same form as scrapeResponse. */
+    char    announceResponse[128];
 
     /** Time the most recent scrape request was sent,