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

Merge pull request #4245 from spalger/fix/server-debug-mode

Browse source 
Fix/server debug mode
This commit is contained in:
Spencer 2015-06-18 07:27:20 -07:00
parent c9045db30d 4c744b9e5c
commit 9c3784ef03
3 changed files with 21 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
tasks/kibana_server.js
View file

@ -1,20 +1,16 @@
module.exports = function (grunt) {
grunt.registerTask('kibana_server', function (keepalive) {
var done = this.async();
var Kibana = require('../');
var devStatics = require('./utils/dev_statics');
var quiet = !grunt.option('debug') && !grunt.option('verbose');
var port = grunt.option('port');
var settings = { 'logging.quiet': quiet };
if (grunt.option('port')) {
settings['kibana.server.port'] = grunt.option('port');
}
var kibana = new Kibana(settings, [devStatics]);
kibana.listen().then(function (server) {
require('./utils/dev_server')({
'logging.quiet': !grunt.option('debug') && !grunt.option('verbose'),
'kibana.server.port': grunt.option('port')
})
.then(function (server) {
grunt.log.ok('Server started: ' + server.info.uri);
if (keepalive !== 'keepalive') done();
}).catch(done);
})
.catch(done);
});
};

6
tasks/maybe_start_kibana.js
View file

@ -6,7 +6,7 @@ module.exports = function (grunt) {
var http = require('http');
var opts = {
method: 'HEAD',
path: '/',
path: '/status/health',
host: 'localhost',
port: options.port
};
@ -17,9 +17,7 @@ module.exports = function (grunt) {
function onResponse(res) {
grunt.log.debug('Server responded with', res.statusCode);
var app = res.headers['x-app-name'];
if (res.statusCode === 200 && app && app === 'kibana') {
if (res.statusCode === 200) {
grunt.log.ok('Kibana server already started on port', options.port);
} else {
grunt.log.error('Another server is already running on port', options.port);

12
tasks/utils/dev_server.js Normal file
View file

@ -0,0 +1,12 @@
var Kibana = require('../../');
var devStatics = require('./dev_statics');
module.exports = function (settings) {
var kibana = new Kibana(settings || {}, [devStatics]);
return kibana.listen();
};
if (require.main === module) {
module.exports();
}