Changeset 3331

Timestamp:

Oct 8, 2007, 5:05:39 PM (15 years ago)

Author:

charles

Message:

give trackers more time before timing out the requests. make the `stopping' timeout interval smaller than other intervals so that we don't block for too long during shutdown.

File:

• trunk/libtransmission/tracker.c (modified) (4 diffs)

trunk/libtransmission/tracker.c

@@ -46 +46 @@
 
 /* this is how long we'll leave a request hanging before timeout */
-#define TIMEOUT_INTERVAL_SEC 5
+#define TIMEOUT_INTERVAL_SEC 40
+#define STOPPING_TIMEOUT_INTERVAL_SEC 8
 
 /* the value of the 'numwant' argument passed in tracker requests */
@@ -172 +173 @@
 {
     struct evhttp_connection * c = evhttp_connection_new( address, port );
-    evhttp_connection_set_timeout( c, TIMEOUT_INTERVAL_SEC );
     evhttp_connection_set_closecb( c, connectionClosedCB, tracker->handle );
     return c;
@@ -709 +709 @@
                 address->address, address->port, uri );
         evcon = getConnection( t, address->address, address->port );
+        evhttp_connection_set_timeout( evcon, TIMEOUT_INTERVAL_SEC );
         req = evhttp_request_new( onScrapeResponse, t );
         assert( req );
@@ -995 +996 @@
         tr_free( t->lastRequest );
         t->lastRequest = tr_strdup( eventName );
-        if( eventName && !strcmp( eventName, "stopped" ) )
+        if( !eventName || !strcmp( eventName, "stopped" ) ) {
+            evhttp_connection_set_timeout( evcon, TIMEOUT_INTERVAL_SEC );
+            httpReq = evhttp_request_new( onTrackerResponse, onTrackerResponseDataNew(t) );
+        } else {
+            evhttp_connection_set_timeout( evcon, STOPPING_TIMEOUT_INTERVAL_SEC );
             httpReq = evhttp_request_new( onStoppedResponse, t->tracker->handle );
-        else
-            httpReq = evhttp_request_new( onTrackerResponse, onTrackerResponseDataNew(t) );
+        }
         addCommonHeaders( t->tracker, httpReq );
         tr_evhttp_make_request( t->tracker->handle, evcon,