Merge pull request #7 from DaMouse404/auto-retry-window

Stretch request timeout in line with retry timeout
iplayer · Aug 14, 2014 · 5ee9f2f · 5ee9f2f
2 parents 5a8617d + a167840
commit 5ee9f2f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/lib/Fetcher.js b/lib/Fetcher.js
@@ -14,7 +14,7 @@ function Fetcher(config) {
         api_key: config.apiKey
     };
     requestOptions = {
-        timeout: 1000
+        timeout: 5000
     };
     retryOptions = {
         retries: 3,
@@ -49,6 +49,7 @@ Fetcher.prototype._request = function (feedName, params) {
     var defer = Q.defer(),
         that = this,
         operation = retry.operation(retryOptions),
+        timeouts = retry.timeouts(retryOptions),
         params = u.extend({}, this.defaultRequestParams, params),
         url = this.config.iblUrl + feedName + '.json?' + qs.stringify(params),
         requestOptions = u.extend({}, this.requestOptions, {url:url});
@@ -57,6 +58,8 @@ Fetcher.prototype._request = function (feedName, params) {
 
     if (cached === false) {
         operation.attempt(function(currentAttempt) {
+            requestOptions.timeout = timeouts[currentAttempt-1];
+
             that.request(requestOptions, function (err, response, body) {
                 if (operation.retry(err)) {
                     console.log("[INFO] Retrying ", feedName);

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fixturator",
-  "version": "0.1.11",
+  "version": "0.1.12",
   "description": "",
   "main": "index.js",
   "repository": {