Merge pull request #920 from p2pu/2021-09-celery

Update celery and update beat service to ignore pid file

Author: dirkcuys

docker-compose.yml

@@ -49,7 +49,7 @@ services:
     volumes:
     - .:/opt/app
     working_dir: /opt/app
-    command: /opt/django-venv/bin/celery worker -A learnwithpeople --loglevel=INFO
+    command: /opt/django-venv/bin/celery -A learnwithpeople worker --loglevel=INFO
     env_file: docker.env
     environment:
     - ADMIN_EMAIL=admin@localhost
@@ -70,7 +70,7 @@ services:
     volumes:
     - .:/opt/app
     working_dir: /opt/app
-    command: /opt/django-venv/bin/celery beat -A learnwithpeople --loglevel=DEBUG --pidfile=/var/lib/celery/celerybeat.pid --schedule=/var/lib/celery/celerybeat-schedule
+    command: /opt/django-venv/bin/celery -A learnwithpeople beat --loglevel=DEBUG --schedule=/var/lib/celery/celerybeat-schedule
     env_file: docker.env
     environment:
     - DATABASE_URL=postgres://lc:password@postgres:5432/lc

learnwithpeople/celery.py

@@ -5,11 +5,9 @@
 # set the default Django settings module for the 'celery' program.
 os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'learnwithpeople.settings')
 
-from django.conf import settings
-
 app = Celery('proj')
-app.config_from_object('django.conf:settings')
-app.autodiscover_tasks(lambda: settings.INSTALLED_APPS)
+app.config_from_object('django.conf:settings', namespace='CELERY')
+app.autodiscover_tasks()
 
 @app.task(bind=True)
 def debug_task(self):

learnwithpeople/settings.py

@@ -230,12 +230,13 @@
 GA_TRACKING_ID = env('GA_TRACKING_ID', 'UA-0000000-00')
 
 ####### Celery config #######
+# TODO this might need to change to CELERY_BROKER_URL
 BROKER_URL = env('BROKER_URL', 'amqp://guest:guest@localhost//')
 
 
 from celery.schedules import crontab
 
-CELERYBEAT_SCHEDULE = {
+CELERY_BEAT_SCHEDULE = {
     'send_reminders': {
         'task': 'studygroups.tasks.send_reminders',
         'schedule': crontab(minute='*/5'),

requirements.txt

@@ -1,20 +1,25 @@
-amqp==1.4.9
+amqp==5.0.6
 anyjson==0.3.3
 appdirs==1.4.3
 arrow==0.4.2
 Babel==2.3.4
 beautifulsoup4==4.6.3
-billiard==3.3.0.23
+billiard==3.6.4.0
 bleach==3.1.5
 boto==2.38.0
 boto3==1.7.3
 botocore==1.10.3
+cached-property==1.5.2
 cairocffi==0.9.0
 CairoSVG==2.1.3
-celery==3.1.25
+celery==5.1.2
 certifi==2019.3.9
 cffi==1.11.5
 chardet==3.0.4
+click==7.1.2
+click-didyoumean==0.0.3
+click-plugins==1.1.1
+click-repl==0.2.0
 cssselect==1.0.3
 cssselect2==0.2.1
 cssutils==1.0.2
@@ -41,15 +46,18 @@ html5lib==1.0.1
 httplib2==0.18.0
 icalendar==4.0.3
 idna==2.8
+importlib-metadata==4.8.1
 jmespath==0.9.3
-kombu==3.0.37
+kombu==5.1.0
 lxml==4.2.5
 Markdown==3.1.1
+mock==4.0.3
 olefile==0.44
 packaging==16.8
 phonenumberslite==7.7.0
 Pillow==6.2.0
 premailer==3.2.0
+prompt-toolkit==3.0.20
 psycopg2==2.7.3.1
 pycparser==2.19
 pygal==2.4.0
@@ -64,10 +72,14 @@ s3-backup-rotate==0.3.3
 s3transfer==0.1.13
 selenium==3.141.0
 six==1.11.0
+sqlparse==0.4.1
 tinycss2==0.6.1
 transifex-client==0.12.4
 twilio==6.8.0
+typing-extensions==3.10.0.2
 unicodecsv==0.14.1
 urllib3==1.25.2
-vine==1.1.3
+vine==5.0.0
+wcwidth==0.2.5
 webencodings==0.5.1
+zipp==3.5.0