github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 01:38:56 -04:00
Code Issues Projects Releases Packages Wiki Activity

[6.x] Re-enable "src/cli/serve/integration_tests/reload_logging_config.test.js" tests. (#26778)

Browse source
This commit is contained in:
Aleh Zasypkin 2018-12-06 21:24:35 +01:00 • committed by GitHub
parent 712dea729a
commit 40f0a846f7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 46 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

91
src/cli/serve/integration_tests/reload_logging_config.test.js
View file

@ -139,59 +139,60 @@ describe('Server logging configuration', function () {
expect(exitCode).toEqual(0);
expect(sawJson).toEqual(true);
expect(sawNonjson).toEqual(true);
}, 60000);
}
}, minute);
it.skip('should recreate file handler on SIGHUP', function (done) {
expect.hasAssertions();
it('should recreate file handler on SIGHUP', function (done) {
expect.hasAssertions();
const logPath = path.resolve(tempDir, 'kibana.log');
const logPathArchived = path.resolve(tempDir, 'kibana_archive.log');
const logPath = path.resolve(tempDir, 'kibana.log');
const logPathArchived = path.resolve(tempDir, 'kibana_archive.log');
function watchFileUntil(path, matcher, timeout) {
return new Promise((resolve, reject) => {
const timeoutHandle = setTimeout(() => {
fs.unwatchFile(path);
reject(`watchFileUntil timed out for "${matcher}"`);
}, timeout);
function watchFileUntil(path, matcher, timeout) {
return new Promise((resolve, reject) => {
const timeoutHandle = setTimeout(() => {
fs.unwatchFile(path);
reject(`watchFileUntil timed out for "${matcher}"`);
}, timeout);
fs.watchFile(path, () => {
try {
const contents = fs.readFileSync(path);
fs.watchFile(path, () => {
try {
const contents = fs.readFileSync(path);
if (matcher.test(contents)) {
clearTimeout(timeoutHandle);
fs.unwatchFile(path);
resolve(contents);
if (matcher.test(contents)) {
clearTimeout(timeoutHandle);
fs.unwatchFile(path);
resolve(contents);
}
} catch (e) {
// noop
}
} catch (e) {
// noop
}
});
});
});
}
}
child = spawn(process.execPath, [
kibanaPath,
'--logging.dest', logPath,
'--plugins.initialize', 'false',
'--logging.json', 'false'
]);
child = spawn(process.execPath, [
kibanaPath,
'--config', testConfigFile,
'--logging.dest', logPath,
'--plugins.initialize', 'false',
'--logging.json', 'false'
]);
watchFileUntil(logPath, /Server running at/, 2 * minute)
.then(() => {
// once the server is running, archive the log file and issue SIGHUP
fs.renameSync(logPath, logPathArchived);
child.kill('SIGHUP');
})
.then(() => watchFileUntil(logPath, /Reloaded logging configuration due to SIGHUP/, 10 * second))
.then(contents => {
const lines = contents.toString().split('\n');
// should be the first and only new line of the log file
expect(lines).toHaveLength(2);
child.kill();
})
.then(done, done);
watchFileUntil(logPath, /Server running at/, 2 * minute)
.then(() => {
// once the server is running, archive the log file and issue SIGHUP
fs.renameSync(logPath, logPathArchived);
child.kill('SIGHUP');
})
.then(() => watchFileUntil(logPath, /Reloaded logging configuration due to SIGHUP/, 10 * second))
.then(contents => {
const lines = contents.toString().split('\n');
// should be the first and only new line of the log file
expect(lines).toHaveLength(2);
child.kill();
})
.then(done, done);
}, 3 * minute);
}, 3 * minute);
}
});