Skip to content

Commit

Permalink
test: change expression order, not to have to use console
Browse files Browse the repository at this point in the history
  • Loading branch information
delanni committed Jun 2, 2023
1 parent 0d49327 commit e505a24
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
5 changes: 2 additions & 3 deletions packages/core/root/core-root-server-internal/src/bootstrap.ts
Expand Up @@ -78,9 +78,9 @@ export async function bootstrap({ configs, cliArgs, applyConfigOverrides }: Boot
}

const root = new Root(rawConfigService, env, onRootShutdown);
const cliLogger = root.logger.get('cli');

// eslint-disable-next-line no-console
console.log('Configurations parsed in this order: ' + env.configs.join(', '));
cliLogger.info('Kibana configurations evaluated in this order: ' + env.configs.join(', '));

process.on('SIGHUP', () => reloadConfiguration());

Expand All @@ -96,7 +96,6 @@ export async function bootstrap({ configs, cliArgs, applyConfigOverrides }: Boot
});

function reloadConfiguration(reason = 'SIGHUP signal received') {
const cliLogger = root.logger.get('cli');
cliLogger.info(`Reloading Kibana configuration (reason: ${reason}).`, { tags: ['config'] });

try {
Expand Down
1 change: 1 addition & 0 deletions src/cli/serve/integration_tests/config_ordering.test.ts
Expand Up @@ -127,6 +127,7 @@ describe('Server configuration ordering', () => {
'serverless.recent.yml',
'kibana.dev.yml',
'serverless.dev.yml',
'serverless.recent.dev.yml',
// 'serverless.es.dev.yml', // Shouldn't this be loaded? It's mentioned in the README, but wasn't in the code
]);
});
Expand Down

0 comments on commit e505a24

Please sign in to comment.