From 714639c3f7b04fef41e3216f152a40d421cdfa18 Mon Sep 17 00:00:00 2001 From: Ahmet Cetin Date: Wed, 22 Feb 2017 15:32:42 +0000 Subject: [PATCH 1/4] pinging elasticsearch before indexing --- index.js | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/index.js b/index.js index 533a3b8..cd2a6f2 100644 --- a/index.js +++ b/index.js @@ -61,11 +61,21 @@ ElasticsearchStream.prototype._write = function (entry, encoding, callback) { }; var self = this; - client.index(options, function (err, resp) { - if (err) { - self.emit('error', err); + + client.ping({ + requestTimeout: Infinity, + hello: 'elasticsearch!' + }, function (error) { + if (error) { + console.trace('elasticsearch cluster is down!'); + } else { + client.index(options, function (err, resp) { + if (err) { + self.emit('error', err); + } + callback(); + }); } - callback(); }); }; From 2ff278f95b7a35c9b92eb747e5e5804345217a65 Mon Sep 17 00:00:00 2001 From: Ahmet Cetin Date: Wed, 22 Feb 2017 15:38:26 +0000 Subject: [PATCH 2/4] pinging elasticsearch before indexing --- index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.js b/index.js index cd2a6f2..1d3dd71 100644 --- a/index.js +++ b/index.js @@ -67,7 +67,7 @@ ElasticsearchStream.prototype._write = function (entry, encoding, callback) { hello: 'elasticsearch!' }, function (error) { if (error) { - console.trace('elasticsearch cluster is down!'); + console.error('elasticsearch cluster is down!'); } else { client.index(options, function (err, resp) { if (err) { From d86e89d95d7631797cfde7380da74b2a1ee637ad Mon Sep 17 00:00:00 2001 From: Ahmet Cetin Date: Wed, 22 Feb 2017 15:39:29 +0000 Subject: [PATCH 3/4] pinging elasticsearch before indexing --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f36cb8d..9de1912 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "bunyan-elasticsearch", - "version": "1.0.1", + "version": "1.0.2", "description": "A Bunyan stream for sending log data to Elasticsearch", "main": "index.js", "scripts": { From 17c7aeb2ece18a318866169d6030f87e2a609d88 Mon Sep 17 00:00:00 2001 From: Ahmet Cetin Date: Mon, 26 Jun 2017 06:53:43 +0200 Subject: [PATCH 4/4] es.ping method change in es5 sending hello parameter in ping method causes es to return 400 in version 5, so removed. --- index.js | 1 - 1 file changed, 1 deletion(-) diff --git a/index.js b/index.js index 1d3dd71..d48c769 100644 --- a/index.js +++ b/index.js @@ -64,7 +64,6 @@ ElasticsearchStream.prototype._write = function (entry, encoding, callback) { client.ping({ requestTimeout: Infinity, - hello: 'elasticsearch!' }, function (error) { if (error) { console.error('elasticsearch cluster is down!');