reverted timeout padding and default requestTimeout default

Fixes #6377
elastic · Mar 2, 2016 · 53805de · 53805de
1 parent 4f2e328
commit 53805de
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/plugins/elasticsearch/index.js b/src/plugins/elasticsearch/index.js
@@ -19,7 +19,7 @@ module.exports = function ({ Plugin }) {
         username: string(),
         password: string(),
         shardTimeout: number().default(0),
-        requestTimeout: number().default(300000),
+        requestTimeout: number().default(30000),
         pingTimeout: number().default(30000),
         startupTimeout: number().default(5000),
         ssl: object({

diff --git a/src/plugins/elasticsearch/lib/create_proxy.js b/src/plugins/elasticsearch/lib/create_proxy.js
@@ -19,7 +19,7 @@ function createProxy(server, method, route, config) {
         passThrough: true,
         agent: createAgent(server),
         xforward: true,
-        timeout: server.config().get('elasticsearch.requestTimeout') + 100
+        timeout: server.config().get('elasticsearch.requestTimeout')
       }
     },
   };

diff --git a/src/server/KbnServer.js b/src/server/KbnServer.js
@@ -73,7 +73,7 @@ module.exports = class KbnServer {
     let { server, config } = this;
 
     await this.ready();
-    server.listener.timeout = config.get('elasticsearch.requestTimeout') + 100;
+    server.listener.timeout = config.get('elasticsearch.requestTimeout');
     await fromNode(cb => server.start(cb));
     await require('./pid')(this, server, config);