Allow to configure capacity strategy

- HTTP strategy: mechanism to compute load from db host.
- Fixed strategy: hardcoded number of queries to run at the same time, via configuration.

batch/scheduler/capacity/fixed.js

@@ -0,0 +1,11 @@
+'use strict';
+
+function FixedCapacity(capacity) {
+    this.capacity = Math.max(1, capacity);
+}
+
+module.exports = FixedCapacity;
+
+FixedCapacity.prototype.getCapacity = function(callback) {
+    return callback(null, this.capacity);
+};

batch/scheduler/capacity/http-simple.js

@@ -0,0 +1,42 @@
+'use strict';
+
+var request = require('request');
+var debug = require('../../util/debug')('capacity-http');
+
+function HttpSimpleCapacity(host, capacityEndpoint) {
+    this.host = host;
+    this.capacityEndpoint = capacityEndpoint;
+}
+
+module.exports = HttpSimpleCapacity;
+
+HttpSimpleCapacity.prototype.getCapacity = function(callback) {
+    var requestParams = {
+        method: 'POST',
+        url: this.capacityEndpoint,
+        json: true
+    };
+    debug('getCapacity(%s)', this.host);
+    request.post(requestParams, function(err, res, jsonRes) {
+        var capacity = 1;
+
+        if (!err && jsonRes) {
+            if (jsonRes.retcode === 0) {
+                var values = jsonRes.return_values;
+
+                var cores = parseInt(values.cores, 10);
+                var relativeLoad = parseFloat(values.relative_load);
+
+                capacity = Math.max(
+                    Math.floor(((1 - relativeLoad) * cores) - 1),
+                    1
+                );
+
+                debug('host=%s, capacity=%s', this.host, capacity);
+            }
+        }
+
+        debug('host=%s, capacity=%s', this.host, capacity);
+        return callback(null, capacity);
+    }.bind(this));
+};

batch/scheduler/capacity/infinity.js

@@ -1,11 +0,0 @@
-'use strict';
-
-function InfinityCapacity() {
-
-}
-
-module.exports = InfinityCapacity;
-
-InfinityCapacity.prototype.getCapacity = function(callback) {
-    return callback(null, Infinity);
-};

batch/scheduler/capacity/one.js

@@ -1,11 +0,0 @@
-'use strict';
-
-function OneCapacity() {
-
-}
-
-module.exports = OneCapacity;
-
-OneCapacity.prototype.getCapacity = function(callback) {
-    return callback(null, 1);
-};

batch/scheduler/host-scheduler.js

@@ -1,10 +1,11 @@
 'use strict';
 
+var _ = require('underscore');
 var debug = require('../util/debug')('host-scheduler');
 var Scheduler = require('./scheduler');
 var Locker = require('../leader/locker');
-var InfinityCapacity = require('./capacity/infinity');
-//var OneCapacity = require('./capacity/one');
+var FixedCapacity = require('./capacity/fixed');
+var HttpSimpleCapacity = require('./capacity/http-simple');
 
 function HostScheduler(name, taskRunner, redisPool) {
     this.name = name || 'scheduler';
@@ -33,6 +34,21 @@ HostScheduler.prototype.add = function(host, user, callback) {
     }.bind(this));
 };
 
+HostScheduler.prototype.getCapacityProvider = function(host) {
+    var strategy = global.settings.batch_capacity_strategy || 'fixed';
+    if (strategy === 'http') {
+        if (global.settings.batch_capacity_http_url_template) {
+            var endpoint = _.template(global.settings.batch_capacity_http_url_template, { dbhost: host });
+            debug('Using strategy=%s capacity. Endpoint=%s', strategy, endpoint);
+            return new HttpSimpleCapacity(host, endpoint);
+        }
+    }
+
+    var fixedCapacity = global.settings.batch_capacity_fixed_amount || 1;
+    debug('Using strategy=fixed capacity=%d', fixedCapacity);
+    return new FixedCapacity(fixedCapacity);
+};
+
 HostScheduler.prototype.lock = function(host, callback) {
     debug('[%s] lock(%s)', this.name, host);
     var self = this;
@@ -43,7 +59,7 @@ HostScheduler.prototype.lock = function(host, callback) {
         }
 
         if (!self.schedulers.hasOwnProperty(host)) {
-            var scheduler = new Scheduler(new InfinityCapacity(host), self.taskRunner);
+            var scheduler = new Scheduler(self.getCapacityProvider(host), self.taskRunner);
             scheduler.on('done', self.unlock.bind(self, host));
             self.schedulers[host] = scheduler;
         }

config/environments/development.js.example

@@ -34,6 +34,20 @@ module.exports.batch_query_timeout = 12 * 3600 * 1000; // 12 hours in millisecon
 module.exports.batch_log_filename = 'logs/batch-queries.log';
 // Max number of queued jobs a user can have at a given time
 module.exports.batch_max_queued_jobs = 64;
+// Capacity strategy to use.
+// It allows to tune how many queries run at a db host at the same time.
+// Options: 'fixed', 'http'
+module.exports.batch_capacity_strategy = 'fixed';
+// Applies when strategy='fixed'.
+// Number of simultaneous users running queries in the same host.
+// It will use 1 as min.
+module.exports.batch_capacity_fixed_amount = 2;
+// Applies when strategy='http'.
+// HTTP endpoint to check db host load.
+// Helps to decide the number of simultaneous users running queries in that host.
+// It will use 1 as min.
+// If no template is provided it will default to 'fixed' strategy.
+module.exports.batch_capacity_http_url_template = 'http://<%= dbhost %>:9999/load';
 // Max database connections in the pool
 // Subsequent connections will wait for a free slot.
 // NOTE: not used by OGR-mediated accesses

config/environments/production.js.example

@@ -35,6 +35,20 @@ module.exports.batch_query_timeout = 12 * 3600 * 1000; // 12 hours in millisecon
 module.exports.batch_log_filename = 'logs/batch-queries.log';
 // Max number of queued jobs a user can have at a given time
 module.exports.batch_max_queued_jobs = 64;
+// Capacity strategy to use.
+// It allows to tune how many queries run at a db host at the same time.
+// Options: 'fixed', 'http'
+module.exports.batch_capacity_strategy = 'fixed';
+// Applies when strategy='fixed'.
+// Number of simultaneous users running queries in the same host.
+// It will use 1 as min.
+module.exports.batch_capacity_fixed_amount = 2;
+// Applies when strategy='http'.
+// HTTP endpoint to check db host load.
+// Helps to decide the number of simultaneous users running queries in that host.
+// It will use 1 as min.
+// If no template is provided it will default to 'fixed' strategy.
+module.exports.batch_capacity_http_url_template = 'http://<%= dbhost %>:9999/load';
 // Max database connections in the pool
 // Subsequent connections will wait for a free slot.i
 // NOTE: not used by OGR-mediated accesses

config/environments/staging.js.example

@@ -35,6 +35,20 @@ module.exports.batch_query_timeout = 12 * 3600 * 1000; // 12 hours in millisecon
 module.exports.batch_log_filename = 'logs/batch-queries.log';
 // Max number of queued jobs a user can have at a given time
 module.exports.batch_max_queued_jobs = 64;
+// Capacity strategy to use.
+// It allows to tune how many queries run at a db host at the same time.
+// Options: 'fixed', 'http'
+module.exports.batch_capacity_strategy = 'fixed';
+// Applies when strategy='fixed'.
+// Number of simultaneous users running queries in the same host.
+// It will use 1 as min.
+module.exports.batch_capacity_fixed_amount = 2;
+// Applies when strategy='http'.
+// HTTP endpoint to check db host load.
+// Helps to decide the number of simultaneous users running queries in that host.
+// It will use 1 as min.
+// If no template is provided it will default to 'fixed' strategy.
+module.exports.batch_capacity_http_url_template = 'http://<%= dbhost %>:9999/load';
 // Max database connections in the pool
 // Subsequent connections will wait for a free slot.
 // NOTE: not used by OGR-mediated accesses

config/environments/test.js.example

@@ -32,6 +32,20 @@ module.exports.batch_query_timeout = 5 * 1000; // 5 seconds in milliseconds
 module.exports.batch_log_filename = 'logs/batch-queries.log';
 // Max number of queued jobs a user can have at a given time
 module.exports.batch_max_queued_jobs = 64;
+// Capacity strategy to use.
+// It allows to tune how many queries run at a db host at the same time.
+// Options: 'fixed', 'http'
+module.exports.batch_capacity_strategy = 'fixed';
+// Applies when strategy='fixed'.
+// Number of simultaneous users running queries in the same host.
+// It will use 1 as min.
+module.exports.batch_capacity_fixed_amount = 2;
+// Applies when strategy='http'.
+// HTTP endpoint to check db host load.
+// Helps to decide the number of simultaneous users running queries in that host.
+// It will use 1 as min.
+// If no template is provided it will default to 'fixed' strategy.
+module.exports.batch_capacity_http_url_template = 'http://<%= dbhost %>:9999/load';
 // Max database connections in the pool
 // Subsequent connections will wait for a free slot.
 // NOTE: not used by OGR-mediated accesses

npm-shrinkwrap.json

@@ -4,7 +4,7 @@
   "dependencies": {
     "bintrees": {
       "version": "1.0.1",
-      "from": "bintrees@>=1.0.1 <2.0.0",
+      "from": "bintrees@1.0.1",
       "resolved": "https://registry.npmjs.org/bintrees/-/bintrees-1.0.1.tgz"
     },
     "bunyan": {
@@ -651,7 +651,7 @@
             },
             "mime-types": {
               "version": "2.1.12",
-              "from": "mime-types@>=2.1.11 <2.2.0",
+              "from": "mime-types@>=2.1.7 <2.2.0",
               "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.12.tgz",
               "dependencies": {
                 "mime-db": {
@@ -748,6 +748,377 @@
         }
       }
     },
+    "request": {
+      "version": "2.75.0",
+      "from": "request@>=2.75.0 <2.76.0",
+      "resolved": "https://registry.npmjs.org/request/-/request-2.75.0.tgz",
+      "dependencies": {
+        "aws-sign2": {
+          "version": "0.6.0",
+          "from": "aws-sign2@>=0.6.0 <0.7.0",
+          "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz"
+        },
+        "aws4": {
+          "version": "1.5.0",
+          "from": "aws4@>=1.2.1 <2.0.0",
+          "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.5.0.tgz"
+        },
+        "bl": {
+          "version": "1.1.2",
+          "from": "bl@>=1.1.2 <1.2.0",
+          "resolved": "https://registry.npmjs.org/bl/-/bl-1.1.2.tgz",
+          "dependencies": {
+            "readable-stream": {
+              "version": "2.0.6",
+              "from": "readable-stream@>=2.0.5 <2.1.0",
+              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz",
+              "dependencies": {
+                "core-util-is": {
+                  "version": "1.0.2",
+                  "from": "core-util-is@>=1.0.0 <1.1.0",
+                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
+                },
+                "inherits": {
+                  "version": "2.0.3",
+                  "from": "inherits@>=2.0.1 <2.1.0",
+                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"
+                },
+                "isarray": {
+                  "version": "1.0.0",
+                  "from": "isarray@>=1.0.0 <1.1.0",
+                  "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"
+                },
+                "process-nextick-args": {
+                  "version": "1.0.7",
+                  "from": "process-nextick-args@>=1.0.6 <1.1.0",
+                  "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz"
+                },
+                "string_decoder": {
+                  "version": "0.10.31",
+                  "from": "string_decoder@>=0.10.0 <0.11.0",
+                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                },
+                "util-deprecate": {
+                  "version": "1.0.2",
+                  "from": "util-deprecate@>=1.0.1 <1.1.0",
+                  "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
+                }
+              }
+            }
+          }
+        },
+        "caseless": {
+          "version": "0.11.0",
+          "from": "caseless@>=0.11.0 <0.12.0",
+          "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz"
+        },
+        "combined-stream": {
+          "version": "1.0.5",
+          "from": "combined-stream@>=1.0.5 <1.1.0",
+          "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
+          "dependencies": {
+            "delayed-stream": {
+              "version": "1.0.0",
+              "from": "delayed-stream@>=1.0.0 <1.1.0",
+              "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"
+            }
+          }
+        },
+        "extend": {
+          "version": "3.0.0",
+          "from": "extend@>=3.0.0 <3.1.0",
+          "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz"
+        },
+        "forever-agent": {
+          "version": "0.6.1",
+          "from": "forever-agent@>=0.6.1 <0.7.0",
+          "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"
+        },
+        "form-data": {
+          "version": "2.0.0",
+          "from": "form-data@>=2.0.0 <2.1.0",
+          "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.0.0.tgz",
+          "dependencies": {
+            "asynckit": {
+              "version": "0.4.0",
+              "from": "asynckit@>=0.4.0 <0.5.0",
+              "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz"
+            }
+          }
+        },
+        "har-validator": {
+          "version": "2.0.6",
+          "from": "har-validator@>=2.0.6 <2.1.0",
+          "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz",
+          "dependencies": {
+            "chalk": {
+              "version": "1.1.3",
+              "from": "chalk@>=1.1.1 <2.0.0",
+              "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+              "dependencies": {
+                "ansi-styles": {
+                  "version": "2.2.1",
+                  "from": "ansi-styles@>=2.2.1 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz"
+                },
+                "escape-string-regexp": {
+                  "version": "1.0.5",
+                  "from": "escape-string-regexp@>=1.0.2 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"
+                },
+                "has-ansi": {
+                  "version": "2.0.0",
+                  "from": "has-ansi@>=2.0.0 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
+                  "dependencies": {
+                    "ansi-regex": {
+                      "version": "2.0.0",
+                      "from": "ansi-regex@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
+                    }
+                  }
+                },
+                "strip-ansi": {
+                  "version": "3.0.1",
+                  "from": "strip-ansi@>=3.0.0 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+                  "dependencies": {
+                    "ansi-regex": {
+                      "version": "2.0.0",
+                      "from": "ansi-regex@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
+                    }
+                  }
+                },
+                "supports-color": {
+                  "version": "2.0.0",
+                  "from": "supports-color@>=2.0.0 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"
+                }
+              }
+            },
+            "commander": {
+              "version": "2.9.0",
+              "from": "commander@>=2.9.0 <3.0.0",
+              "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz",
+              "dependencies": {
+                "graceful-readlink": {
+                  "version": "1.0.1",
+                  "from": "graceful-readlink@>=1.0.0",
+                  "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz"
+                }
+              }
+            },
+            "is-my-json-valid": {
+              "version": "2.15.0",
+              "from": "is-my-json-valid@>=2.12.4 <3.0.0",
+              "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.15.0.tgz",
+              "dependencies": {
+                "generate-function": {
+                  "version": "2.0.0",
+                  "from": "generate-function@>=2.0.0 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz"
+                },
+                "generate-object-property": {
+                  "version": "1.2.0",
+                  "from": "generate-object-property@>=1.1.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz",
+                  "dependencies": {
+                    "is-property": {
+                      "version": "1.0.2",
+                      "from": "is-property@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz"
+                    }
+                  }
+                },
+                "jsonpointer": {
+                  "version": "4.0.0",
+                  "from": "jsonpointer@>=4.0.0 <5.0.0",
+                  "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.0.tgz"
+                },
+                "xtend": {
+                  "version": "4.0.1",
+                  "from": "xtend@>=4.0.0 <5.0.0",
+                  "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"
+                }
+              }
+            },
+            "pinkie-promise": {
+              "version": "2.0.1",
+              "from": "pinkie-promise@>=2.0.0 <3.0.0",
+              "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
+              "dependencies": {
+                "pinkie": {
+                  "version": "2.0.4",
+                  "from": "pinkie@>=2.0.0 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz"
+                }
+              }
+            }
+          }
+        },
+        "hawk": {
+          "version": "3.1.3",
+          "from": "hawk@>=3.1.3 <3.2.0",
+          "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",
+          "dependencies": {
+            "hoek": {
+              "version": "2.16.3",
+              "from": "hoek@>=2.0.0 <3.0.0",
+              "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz"
+            },
+            "boom": {
+              "version": "2.10.1",
+              "from": "boom@>=2.0.0 <3.0.0",
+              "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz"
+            },
+            "cryptiles": {
+              "version": "2.0.5",
+              "from": "cryptiles@>=2.0.0 <3.0.0",
+              "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz"
+            },
+            "sntp": {
+              "version": "1.0.9",
+              "from": "sntp@>=1.0.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz"
+            }
+          }
+        },
+        "http-signature": {
+          "version": "1.1.1",
+          "from": "http-signature@>=1.1.0 <1.2.0",
+          "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz",
+          "dependencies": {
+            "assert-plus": {
+              "version": "0.2.0",
+              "from": "assert-plus@>=0.2.0 <0.3.0",
+              "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz"
+            },
+            "jsprim": {
+              "version": "1.3.1",
+              "from": "jsprim@>=1.2.2 <2.0.0",
+              "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.3.1.tgz",
+              "dependencies": {
+                "extsprintf": {
+                  "version": "1.0.2",
+                  "from": "extsprintf@1.0.2",
+                  "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz"
+                },
+                "json-schema": {
+                  "version": "0.2.3",
+                  "from": "json-schema@0.2.3",
+                  "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz"
+                },
+                "verror": {
+                  "version": "1.3.6",
+                  "from": "verror@1.3.6",
+                  "resolved": "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz"
+                }
+              }
+            },
+            "sshpk": {
+              "version": "1.10.1",
+              "from": "sshpk@>=1.7.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.10.1.tgz",
+              "dependencies": {
+                "asn1": {
+                  "version": "0.2.3",
+                  "from": "asn1@>=0.2.3 <0.3.0",
+                  "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz"
+                },
+                "assert-plus": {
+                  "version": "1.0.0",
+                  "from": "assert-plus@>=1.0.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"
+                },
+                "dashdash": {
+                  "version": "1.14.0",
+                  "from": "dashdash@>=1.12.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.0.tgz"
+                },
+                "getpass": {
+                  "version": "0.1.6",
+                  "from": "getpass@>=0.1.1 <0.2.0",
+                  "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.6.tgz"
+                },
+                "jsbn": {
+                  "version": "0.1.0",
+                  "from": "jsbn@>=0.1.0 <0.2.0",
+                  "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.0.tgz"
+                },
+                "tweetnacl": {
+                  "version": "0.14.3",
+                  "from": "tweetnacl@>=0.14.0 <0.15.0",
+                  "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.3.tgz"
+                },
+                "jodid25519": {
+                  "version": "1.0.2",
+                  "from": "jodid25519@>=1.0.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/jodid25519/-/jodid25519-1.0.2.tgz"
+                },
+                "ecc-jsbn": {
+                  "version": "0.1.1",
+                  "from": "ecc-jsbn@>=0.1.1 <0.2.0",
+                  "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz"
+                },
+                "bcrypt-pbkdf": {
+                  "version": "1.0.0",
+                  "from": "bcrypt-pbkdf@>=1.0.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.0.tgz"
+                }
+              }
+            }
+          }
+        },
+        "is-typedarray": {
+          "version": "1.0.0",
+          "from": "is-typedarray@>=1.0.0 <1.1.0",
+          "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz"
+        },
+        "isstream": {
+          "version": "0.1.2",
+          "from": "isstream@>=0.1.2 <0.2.0",
+          "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"
+        },
+        "json-stringify-safe": {
+          "version": "5.0.1",
+          "from": "json-stringify-safe@>=5.0.1 <5.1.0",
+          "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"
+        },
+        "mime-types": {
+          "version": "2.1.12",
+          "from": "mime-types@>=2.1.7 <2.2.0",
+          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.12.tgz",
+          "dependencies": {
+            "mime-db": {
+              "version": "1.24.0",
+              "from": "mime-db@>=1.24.0 <1.25.0",
+              "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.24.0.tgz"
+            }
+          }
+        },
+        "oauth-sign": {
+          "version": "0.8.2",
+          "from": "oauth-sign@>=0.8.1 <0.9.0",
+          "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz"
+        },
+        "stringstream": {
+          "version": "0.0.5",
+          "from": "stringstream@>=0.0.4 <0.1.0",
+          "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz"
+        },
+        "tough-cookie": {
+          "version": "2.3.1",
+          "from": "tough-cookie@>=2.3.0 <2.4.0",
+          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.1.tgz"
+        },
+        "tunnel-agent": {
+          "version": "0.4.3",
+          "from": "tunnel-agent@>=0.4.1 <0.5.0",
+          "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz"
+        }
+      }
+    },
     "step": {
       "version": "0.0.6",
       "from": "step@>=0.0.5 <0.1.0",
@@ -794,7 +1165,7 @@
           "dependencies": {
             "strip-ansi": {
               "version": "3.0.1",
-              "from": "strip-ansi@>=3.0.1 <4.0.0",
+              "from": "strip-ansi@>=3.0.0 <4.0.0",
               "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
               "dependencies": {
                 "ansi-regex": {
@@ -1071,7 +1442,7 @@
             },
             "strip-ansi": {
               "version": "3.0.1",
-              "from": "strip-ansi@>=3.0.1 <4.0.0",
+              "from": "strip-ansi@>=3.0.0 <4.0.0",
               "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
               "dependencies": {
                 "ansi-regex": {

package.json

@@ -34,6 +34,7 @@
     "queue-async": "~1.0.7",
     "redis-mpool": "0.4.0",
     "redlock": "2.0.1",
+    "request": "~2.75.0",
     "step": "~0.0.5",
     "step-profiler": "~0.3.0",
     "topojson": "0.0.8",
@@ -42,7 +43,6 @@
   },
   "devDependencies": {
     "istanbul": "~0.4.2",
-    "request": "~2.60.0",
     "shapefile": "0.3.0",
     "mocha": "~1.21.4",
     "jshint": "~2.6.0",