Skip to content

Commit

Permalink
use requestTimeout and pingTimeout on exposed client
Browse files Browse the repository at this point in the history
Fixes #6377
  • Loading branch information
w33ble committed Mar 2, 2016
1 parent 9992c37 commit 9bdca03
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions src/plugins/elasticsearch/lib/expose_client.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ module.exports = function (server) {
clientKey: config.get('elasticsearch.ssl.key'),
ca: config.get('elasticsearch.ssl.ca'),
apiVersion: config.get('elasticsearch.apiVersion'),
pingTimeout: config.get('elasticsearch.pingTimeout'),
requestTimeout: config.get('elasticsearch.requestTimeout'),
keepAlive: true,
auth: true
});
Expand All @@ -43,6 +45,8 @@ module.exports = function (server) {
ssl: ssl,
apiVersion: options.apiVersion,
keepAlive: options.keepAlive,
pingTimeout: options.pingTimeout,
requestTimeout: options.requestTimeout,
log: function () {
this.error = function (err) {
server.log(['error', 'elasticsearch'], err);
Expand Down

0 comments on commit 9bdca03

Please sign in to comment.