Moving where we're disabling the ui settings

This commit is contained in:
= 2016-10-19 17:22:52 -04:00
parent c6f90e2fd3
commit e66c7e79f9

View file

@ -3,6 +3,12 @@ import defaultsProvider from './defaults';
export default function setupSettings(kbnServer, server, config) {
const status = kbnServer.status.create('ui settings');
if (!kbnServer.config.get('plugins.initialize')) {
status.disabled('Disabled because plugins are disabled');
return;
}
const uiSettings = {
// returns a Promise for the value of the requested setting
get,
@ -26,7 +32,7 @@ export default function setupSettings(kbnServer, server, config) {
};
server.decorate('server', 'uiSettings', () => uiSettings);
kbnServer.ready().then(setStatus);
kbnServer.ready().then(mirrorEsStatus);
function get(key) {
return getAll().then(all => all[key]);
@ -96,15 +102,6 @@ export default function setupSettings(kbnServer, server, config) {
return setMany(changes);
}
function setStatus() {
if (!kbnServer.config.get('plugins.initialize')) {
status.disabled('Disabled because plugins are disabled');
return;
}
mirrorEsStatus();
}
function mirrorEsStatus() {
const esStatus = kbnServer.status.getForPluginId('elasticsearch');