Merge pull request #937 from pwagener/master

Fix #490: Connection timed out after 120000ms in function deployment
serverless · Apr 6, 2016 · e2df96b · e2df96b
2 parents bd0482f + 9750d82
commit e2df96b
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/lib/ProviderAws.js b/lib/ProviderAws.js
@@ -32,6 +32,12 @@ module.exports = function(S) {
         AWS.config.httpOptions.agent = new httpsProxyAgent(proxyOptions);
       }
 
+      // Configure the AWS Client timeout (Optional).  The default is 120000 (2 minutes)
+      let timeout = process.env.AWS_CLIENT_TIMEOUT || process.env.aws_client_timeout;
+      if (timeout) {
+        AWS.config.httpOptions.timeout = parseInt(timeout, 10);
+      }
+
       // Detect Profile Prefix. Useful for multiple projects (e.g., myproject_prod)
       this._config.profilePrefix = process.env['AWS_PROFILE_PREFIX'] ? process.env['AWS_PROFILE_PREFIX'] : null;
       if (this._config.profilePrefix && this._config.profilePrefix.charAt(this._config.profilePrefix.length - 1) !== '_') {