Merge pull request #984 from stephenplusplus/spp--core-request-timeout

core: set a 60s timeout on HTTP requests
googleapis · Dec 3, 2015 · 1ac48c3 · 1ac48c3
2 parents ded1b11 + 4bbd1a9
commit 1ac48c3
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 1 deletion.
diff --git a/lib/common/util.js b/lib/common/util.js
@@ -25,6 +25,7 @@ var extend = require('extend');
 var googleAuth = require('google-auto-auth');
 var is = require('is');
 var request = require('request').defaults({
+  timeout: 60000,
   pool: {
     maxSockets: Infinity
   }

diff --git a/lib/pubsub/subscription.js b/lib/pubsub/subscription.js
@@ -493,6 +493,9 @@ Subscription.prototype.pull = function(options, callback) {
   }
 
   this.request({
+    // The default timeout set used in this library is 60s, but a pull request
+    // times out around 90 seconds.
+    timeout: 90000,
     method: 'POST',
     uri: ':pull',
     json: {

diff --git a/test/common/util.js b/test/common/util.js
@@ -97,7 +97,12 @@ describe('common/util', function() {
   });
 
   it('should have set correct defaults on Request', function() {
-    assert.deepEqual(REQUEST_DEFAULT_CONF, { pool: { maxSockets: Infinity } });
+    assert.deepEqual(REQUEST_DEFAULT_CONF, {
+      timeout: 60000,
+      pool: {
+        maxSockets: Infinity
+      }
+    });
   });
 
   it('should export an error for module instantiation errors', function() {

diff --git a/test/pubsub/subscription.js b/test/pubsub/subscription.js
@@ -436,6 +436,7 @@ describe('Subscription', function() {
     it('should make correct api request', function(done) {
       subscription.request = function(reqOpts) {
         assert.strictEqual(reqOpts.method, 'POST');
+        assert.strictEqual(reqOpts.timeout, 90000);
         assert.strictEqual(reqOpts.uri, ':pull');
         assert.strictEqual(reqOpts.json.returnImmediately, false);
         assert.strictEqual(reqOpts.json.maxMessages, 1);