Adds stopasgroup to the supervisor scripts (celery#4200)

* Adds stopasgroup to the supervisor scripts * Add details on the stopasgroup parameter in supervisor configs
JoaoVagner · Aug 16, 2017 · f9a9337 · f9a9337
1 parent 2394e73
commit f9a9337
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
@@ -243,3 +243,4 @@ Samuel Dion-Girardeau, 2017/05/29
 Aydin Sen, 2017/06/14
 Preston Moore, 2017/06/18
 Nicolas Mota, 2017/08/10
+Martial Pageau, 2017/08/16
diff --git a/extra/supervisord/celerybeat.conf b/extra/supervisord/celerybeat.conf
@@ -17,6 +17,9 @@ autostart=true
 autorestart=true
 startsecs=10
 
+; Causes supervisor to send the termination signal (SIGTERM) to the whole process group.
+stopasgroup=true
+
 ; if rabbitmq is supervised, set its priority higher
 ; so it starts first
 priority=999
diff --git a/extra/supervisord/celeryd.conf b/extra/supervisord/celeryd.conf
@@ -24,10 +24,8 @@ startsecs=10
 ; Increase this if you have very long running tasks.
 stopwaitsecs = 600
 
-; When resorting to send SIGKILL to the program to terminate it
-; send SIGKILL to its whole process group instead,
-; taking care of its children as well.
-killasgroup=true
+; Causes supervisor to send the termination signal (SIGTERM) to the whole process group.
+stopasgroup=true
 
 ; Set Celery priority higher than default (999)
 ; so, if rabbitmq is supervised, it will start first.