Archives/gristlabs_grist-core
1
0
Fork 0
mirror of https://github.com/gristlabs/grist-core.git synced 2024-10-27 20:44:07 +00:00
Code Issues Projects Releases Wiki Activity

Don't require running docker with --init to stop with ^C (#892)

Browse Source
This commit is contained in:
Florent 2024-03-18 14:49:42 +01:00 committed by GitHub
parent 48a8af83fc
commit e84c420a37
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/server/lib/shutdown.js
View File

@ -6,6 +6,8 @@
var log = require('app/server/lib/log'); var log = require('app/server/lib/log');
var Promise = require('bluebird'); var Promise = require('bluebird');
var os = require('os');
var cleanupHandlers = []; var cleanupHandlers = [];
var signalsHandled = {}; var signalsHandled = {};
@ -65,8 +67,8 @@ function runCleanupHandlers() {
} }
/** /**
* Internal helper to exit on a signal. It runs the cleanup handlers, and then re-sends the same * Internal helper to exit on a signal. It runs the cleanup handlers, and then
* signal, which will no longer get caught. * exits propagating the same signal code than the one caught.
*/ */
function signalExit(signal) { function signalExit(signal) {
var prog = 'grist[' + process.pid + ']'; var prog = 'grist[' + process.pid + ']';
@ -81,7 +83,12 @@ function signalExit(signal) {
log.info("Server %s exiting on %s", prog, signal); log.info("Server %s exiting on %s", prog, signal);
process.removeListener(signal, dup); process.removeListener(signal, dup);
delete signalsHandled[signal]; delete signalsHandled[signal];
process.kill(process.pid, signal); // Exit with the expected exit code for being killed by this signal.
// Unlike re-sending the same signal, the explicit exit works even
// in a situation when Grist is the init (pid 1) process in a container
// See https://github.com/gristlabs/grist-core/pull/830 (and #892)
const signalNumber = os.constants.signals[signal];
process.exit(process.pid, 128 + signalNumber);
}); });
} }