summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurent Mignon (ACSONE) <laurent.mignon@acsone.eu>2015-06-09 10:06:55 +0200
committerDenis Ledoux <dle@odoo.com>2015-06-12 16:11:59 +0200
commite17844c946879cdc3d4569da8a1e52ebeb8f8963 (patch)
tree50fa6a1f04318f40d8526637f9bc69ad03510027
parente470385d55ffd464fe3344fe0e57b674330f6cae (diff)
[FIX] server: graceful shutdown must send SIGINT instead of SIGTERM to workers
Workers do not specifically handle SIGTERM so it can be used to force quit them, but the graceful shutdown is triggered by SIGINT. Closes #6998
-rw-r--r--openerp/service/workers.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/openerp/service/workers.py b/openerp/service/workers.py
index db64b626245..9264ef12996 100644
--- a/openerp/service/workers.py
+++ b/openerp/service/workers.py
@@ -184,7 +184,7 @@ class Multicorn(object):
_logger.info("Stopping gracefully")
limit = time.time() + self.timeout
for pid in self.workers.keys():
- self.worker_kill(pid, signal.SIGTERM)
+ self.worker_kill(pid, signal.SIGINT)
while self.workers and time.time() < limit:
self.process_zombie()
time.sleep(0.1)