Make the fetch retry behavior configurable

4 files changed, 51 insertions, 6 deletions

diff --git a/doc/cli/config.md b/doc/cli/config.md
index 917de2137..537af5ca0 100644
--- a/doc/cli/config.md
+++ b/doc/cli/config.md
@@ -308,6 +308,38 @@ Makes various commands more forceful.
 * skips cache when requesting from the registry.
 * prevents checks against clobbering non-npm files.
 
+### fetch-retries
+
+* Default: 2
+* Type: Number
+
+The "retries" config for the `retry` module to use when fetching
+packages from the registry.
+
+### fetch-retry-factor
+
+* Default: 10
+* Type: Number
+
+The "factor" config for the `retry` module to use when fetching
+packages.
+
+### fetch-retry-mintimeout
+
+* Default: 10000 (10 seconds)
+* Type: Number
+
+The "minTimeout" config for the `retry` module to use when fetching
+packages.
+
+### fetch-retry-maxtimeout
+
+* Default: 60000 (1 minute)
+* Type: Number
+
+The "maxTimeout" config for the `retry` module to use when fetching
+packages.
+
 ### git
 
 * Default: `"git"`
diff --git a/lib/cache.js b/lib/cache.js
index 269b19781..c6ca8b477 100644
--- a/lib/cache.js
+++ b/lib/cache.js
@@ -314,12 +314,12 @@ function addRemoteTarball (u, shasum, name, cb_) {
       if (er) return cb(er)
       // Tuned to spread 3 attempts over about a minute.
       // See formula at <https://github.com/tim-kos/node-retry>.
-      var operation = retry.operation({
-        retries: 2,
-        factor: 10,
-        minTimeout: 10000,
-        maxTimeout: 60 * 1000
-      })
+      var operation = retry.operation
+        ( { retries: npm.config.get("fetch-retries")
+          , factor: npm.config.get("fetch-retry-factor")
+          , minTimeout: npm.config.get("fetch-retry-mintimeout")
+          , maxTimeout: npm.config.get("fetch-retry-maxtimeout") })
+
       operation.attempt(function (currentAttempt) {
         log.info("retry", "fetch attempt " + currentAttempt
           + " at " + (new Date()).toLocaleTimeString())
diff --git a/lib/npm.js b/lib/npm.js
index f6460f9ae..589eb17fc 100644
--- a/lib/npm.js
+++ b/lib/npm.js
@@ -288,6 +288,10 @@ function load (npm, conf, cb) {
         , E404: npm.E404
         , EPUBLISHCONFLICT: npm.EPUBLISHCONFLICT
         , log: log
+        , retries: npm.config.get("fetch-retries")
+        , retryFactor: npm.config.get("fetch-retry-factor")
+        , retryMinTimeout: npm.config.get("fetch-retry-mintimeout")
+        , retryMaxTimeout: npm.config.get("fetch-retry-maxtimeout")
         })
 
       var umask = parseInt(conf.umask, 8)
diff --git a/lib/utils/config-defs.js b/lib/utils/config-defs.js
index f0982ad41..ee2c22f10 100644
--- a/lib/utils/config-defs.js
+++ b/lib/utils/config-defs.js
@@ -140,6 +140,11 @@ Object.defineProperty(exports, "defaults", {get: function () {
     , "engine-strict": false
     , force : false
 
+    , "fetch-retries": 2
+    , "fetch-retry-factor": 10
+    , "fetch-retry-mintimeout": 10000
+    , "fetch-retry-maxtimeout": 60000
+
     , git: "git"
 
     , global : false
@@ -226,6 +231,10 @@ exports.types =
   , editor : String
   , "engine-strict": Boolean
   , force : Boolean
+  , "fetch-retries": Number
+  , "fetch-retry-factor": Number
+  , "fetch-retry-mintimeout": Number
+  , "fetch-retry-maxtimeout": Number
   , git: String
   , global : Boolean
   , globalconfig : path