From 25364f3ff998040a68a52c07cba698c18af455c8 Mon Sep 17 00:00:00 2001
From: Joe Fleming <joe.fleming@gmail.com>
Date: Mon, 29 Feb 2016 11:49:28 -0700
Subject: [PATCH] set proxy socket timeout

Fixes #6377
---
 src/plugins/elasticsearch/lib/create_proxy.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/plugins/elasticsearch/lib/create_proxy.js b/src/plugins/elasticsearch/lib/create_proxy.js
index 7bcc1e77756b6..338a7aa3433cc 100644
--- a/src/plugins/elasticsearch/lib/create_proxy.js
+++ b/src/plugins/elasticsearch/lib/create_proxy.js
@@ -1,12 +1,18 @@
 const createAgent = require('./create_agent');
 const mapUri = require('./map_uri');
 const { resolve } = require('url');
+const { assign } = require('lodash');
 
 function createProxy(server, method, route, config) {
 
   const options = {
     method: method,
     path: createProxy.createPath(route),
+    config: {
+      timeout: {
+        socket: server.config().get('elasticsearch.requestTimeout')
+      }
+    },
     handler: {
       proxy: {
         mapUri: mapUri(server),
@@ -18,7 +24,7 @@ function createProxy(server, method, route, config) {
     },
   };
 
-  if (config) options.config = config;
+  assign(options.config, config);
 
   server.route(options);
 };