Merge branch 'release/2.16.0' into release/2.17.0release/2.17.0

1 files changed, 3 insertions, 0 deletions

diff --git a/api.js b/api.js
index 1146f86..58a51d7 100644
--- a/api.js
+++ b/api.js
@@ -9,6 +9,7 @@ const Promise = require("bluebird"),
 
 const MADGLORY_TOKEN = process.env.MADGLORY_TOKEN,
     MADGLORY_URL = process.env.MADGLORY_URL || "https://api.dc01.gamelockerapp.com",
+    API_TIMEOUT = process.env.API_TIMEOUT || 20,  // seconds
     ERROR_LOG = process.env.ERROR_LOG || "./errors.json";
 if (MADGLORY_TOKEN == undefined) throw "Need an API token";
 
@@ -31,6 +32,7 @@ module.exports.request = async (url, options, logger) => {
                 gzip: true,
                 time: true,
                 forever: true,
+                timeout: API_TIMEOUT*1000,
                 strictSSL: true,
                 resolveWithFullResponse: true
             };
@@ -69,6 +71,7 @@ module.exports.request = async (url, options, logger) => {
                     qs: options,
                     status: response.statusCode,
                     connection_start: response.timings.connect,
+                    connection_first: response.timings.response,
                     connection_end: response.timings.end,
                     ratelimit_remaining: parseInt(response.headers["x-ratelimit-remaining"])
                 });