From bbe8f576636c0f4fd82e8a4bc8872bc35dcb0c0d Mon Sep 17 00:00:00 2001 From: Marius Tolzmann Date: Mon, 27 Jul 2015 22:00:17 +0200 Subject: [PATCH] mxqd: Continue to kill cancelled jobs while shutdown is active This fixes issue https://github.molgen.mpg.de/mariux64/mxq/issues/2 --- mxqd.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mxqd.c b/mxqd.c index 886c027..7e24415 100644 --- a/mxqd.c +++ b/mxqd.c @@ -1634,6 +1634,9 @@ int main(int argc, char *argv[]) if (global_sigint_cnt) killall(&server, SIGTERM, 0); + killallcancelled(&server, SIGTERM, 0); + killallcancelled(&server, SIGINT, 0); + mx_log_info("jobs_running=%lu global_sigint_cnt=%d global_sigterm_cnt=%d : Exiting. Wating for jobs to finish. Sleeping for a while.", server.jobs_running, global_sigint_cnt, global_sigterm_cnt); sleep(1);