circle: remove django-celery

circle/circle/settings/base.py

@@ -336,7 +336,6 @@ DJANGO_APPS = (
 THIRD_PARTY_APPS = (
 THIRD_PARTY_APPS = (
     'django_tables2',
     'django_tables2',
     'crispy_forms',
     'crispy_forms',
-    'djcelery',
     'sizefield',
     'sizefield',
     'taggit',
     'taggit',
     'statici18n',
     'statici18n',

circle/fabfile.py

@@ -166,6 +166,7 @@ def update_portal(test=False, git=True):
             pull()
             pull()
         cleanup()
         cleanup()
         pip("circle", "~/circle/requirements.txt")
         pip("circle", "~/circle/requirements.txt")
+        sudo("cp ~/circle/miscellaneous/*celery.conf /etc/init/")
         bower()
         bower()
         migrate()
         migrate()
         compile_things()
         compile_things()

miscellaneous/managercelery@.service

@@ -11,5 +11,5 @@ TimeoutStopSec=600
 Restart=always
 Restart=always
 
 
 WorkingDirectory=/home/cloud/circle/circle
 WorkingDirectory=/home/cloud/circle/circle
-ExecStartPre=/bin/bash -c "source /etc/profile; workon circle; ./manage.py celery -f --app=manager.%I purge"
-ExecStart=/bin/bash -c "source /etc/profile; workon circle; exec ./manage.py celery --app=manager.%I worker --autoreload --loglevel=info --hostname=%I -B -c 3"
+ExecStartPre=/bin/bash -c "source /etc/profile; workon circle; celery -f --app=manager.%I purge"
+ExecStart=/bin/bash -c "source /etc/profile; workon circle; exec celery --app=manager.%I worker --loglevel=info --hostname=%I -B -c 3"

miscellaneous/mancelery.conf

@@ -9,11 +9,12 @@ setuid cloud
 kill timeout 360
 kill timeout 360
 kill signal SIGTERM
 kill signal SIGTERM
 
 
+
 script
 script
     cd /home/cloud/circle/circle
     cd /home/cloud/circle/circle
     . /home/cloud/.virtualenvs/circle/bin/activate
     . /home/cloud/.virtualenvs/circle/bin/activate
     . /home/cloud/.virtualenvs/circle/bin/postactivate
     . /home/cloud/.virtualenvs/circle/bin/postactivate
-    ./manage.py celery -f --app=manager.mancelery purge
-    exec ./manage.py celery --app=manager.mancelery worker --autoreload --loglevel=info --hostname=mancelery -B -c 3
+    celery -f --app=manager.mancelery purge
+    exec celery --app=manager.mancelery worker --autoreload --loglevel=info --hostname=mancelery -B -c 3
 end script
 end script
 
 

miscellaneous/moncelery.conf

@@ -3,15 +3,18 @@ description     "CIRCLE moncelery for monitoring jobs"
 respawn
 respawn
 respawn limit 30 30
 respawn limit 30 30
 
 
-
 setgid cloud
 setgid cloud
 setuid cloud
 setuid cloud
 
 
+kill timeout 360
+kill signal SIGTERM
+
+
 script
 script
     cd /home/cloud/circle/circle
     cd /home/cloud/circle/circle
     . /home/cloud/.virtualenvs/circle/bin/activate
     . /home/cloud/.virtualenvs/circle/bin/activate
     . /home/cloud/.virtualenvs/circle/bin/postactivate
     . /home/cloud/.virtualenvs/circle/bin/postactivate
-    ./manage.py celery -f --app=manager.moncelery purge
-    exec ./manage.py celery --app=manager.moncelery worker --autoreload --loglevel=info --hostname=moncelery -B -c 2
+    celery -f --app=manager.moncelery purge
+    exec celery --app=manager.moncelery worker --autoreload --loglevel=info --hostname=moncelery -B -c 2
 end script
 end script
 
 

miscellaneous/slowcelery.conf

@@ -14,7 +14,7 @@ script
     cd /home/cloud/circle/circle
     cd /home/cloud/circle/circle
     . /home/cloud/.virtualenvs/circle/bin/activate
     . /home/cloud/.virtualenvs/circle/bin/activate
     . /home/cloud/.virtualenvs/circle/bin/postactivate
     . /home/cloud/.virtualenvs/circle/bin/postactivate
-    ./manage.py celery -f --app=manager.slowcelery purge
-    exec ./manage.py celery --app=manager.slowcelery worker --autoreload --loglevel=info --hostname=slowcelery -B -c 1
+    celery -f --app=manager.slowcelery purge
+    exec celery --app=manager.slowcelery worker --autoreload --loglevel=info --hostname=slowcelery -B -c 1
 end script
 end script
 
 

requirements/base.txt

@@ -8,7 +8,6 @@ Django==1.8.1
 django-appconf==1.0.1
 django-appconf==1.0.1
 django-autocomplete-light==2.1.1
 django-autocomplete-light==2.1.1
 django-braces==1.8.0
 django-braces==1.8.0
-django-celery==3.1.16
 django-crispy-forms==1.4.0
 django-crispy-forms==1.4.0
 django-model-utils==2.2
 django-model-utils==2.2
 djangosaml2==0.13.0
 djangosaml2==0.13.0