Browse Source

Revert "Some networks can take a long time to resolve so go back to 60 second timeouts instead of 15."

This reverts commit c86a670ce6d264fba10a38f68d65e4b4ab27cba6.

This changed more than just the timeout.
ckolivas 14 years ago
parent
commit
1832b20c40
1 changed files with 7 additions and 1 deletions
  1. 7 1
      util.c

+ 7 - 1
util.c

@@ -319,7 +319,13 @@ json_t *json_rpc_call(CURL *curl, const char *url,
 	struct header_info hi = { };
 	bool probing = false;
 
-	/* it is assumed that 'curl' is freshly [re]initialised at this pt */
+	/* it is assumed that 'curl' is freshly [re]initialized at this pt */
+
+	if (probe) {
+		probing = !pool->probed;
+		/* Probe for only 15 seconds */
+		timeout = 15;
+	}
 	curl_easy_setopt(curl, CURLOPT_TIMEOUT, timeout);
 
 #if 0 /* Disable curl debugging since it spews to stderr */