maxmustermann/kibana
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #3421 from spalger/fix/3269

Browse source 
Fix/3269
This commit is contained in:
Spencer 2015-03-26 13:41:31 -07:00
parent 2270592ff2 d54cbc1a12
commit 9a8e7dd525
2 changed files with 21 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/server/lib/waitForEs.js
View file

@ -15,11 +15,27 @@ function waitForPong() {
}
function waitForShards() {
return client.cluster.health().then(function (resp) {
if (resp.initializing_shards <= 0) return;
return client.cluster.health({
timeout: '5s', // tells es to not sit around and wait forever
index: config.kibana.kibana_index
})
.then(function (resp) {
// if "timed_out" === true then elasticsearch could not
// find any idices matching our filter within 5 seconds
if (resp.timed_out) {
logger.info('No existing kibana index found');
return;
}
logger.info('Elasticsearch is still initializaing... Trying again in 2500 seconds.');
return Promise.delay(2500).then(waitForShards);
// If status === "red" that means that index(es) were found
// but the shards are not ready for queries
if (resp.status === 'red') {
logger.info('Elasticsearch is still initializing the kibana index... Trying again in 2.5 second.');
return Promise.delay(2500).then(waitForShards);
}
// otherwise we are g2g
logger.info('Found kibana index');
});
}

2
tasks/kibana_server.js
View file

@ -2,7 +2,7 @@ module.exports = function (grunt) {
grunt.registerTask('kibana_server', function (keepalive) {
var done = this.async();
var config = require('../src/server/config');
config.quiet = true;
config.quiet = !grunt.option('debug') && !grunt.option('verbose');
var server = require('../src/server');
server.start(function (err) {