From 37ca06c3704c82e343ae20fb84416aea37962aa3 Mon Sep 17 00:00:00 2001 From: Eliot Berriot Date: Fri, 25 Jan 2019 15:39:48 +0100 Subject: [PATCH 1/2] Fixed celery worker defaulting to development settings instead of production --- api/funkwhale_api/taskapp/celery.py | 2 +- changes/changelog.d/celery.bugfix | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 changes/changelog.d/celery.bugfix diff --git a/api/funkwhale_api/taskapp/celery.py b/api/funkwhale_api/taskapp/celery.py index 92fb2a0d9..e86cf0eae 100644 --- a/api/funkwhale_api/taskapp/celery.py +++ b/api/funkwhale_api/taskapp/celery.py @@ -14,7 +14,7 @@ logger = logging.getLogger("celery") if not settings.configured: # set the default Django settings module for the 'celery' program. os.environ.setdefault( - "DJANGO_SETTINGS_MODULE", "config.settings.local" + "DJANGO_SETTINGS_MODULE", "config.settings.production" ) # pragma: no cover app = celery.Celery("funkwhale_api") diff --git a/changes/changelog.d/celery.bugfix b/changes/changelog.d/celery.bugfix new file mode 100644 index 000000000..448a536e6 --- /dev/null +++ b/changes/changelog.d/celery.bugfix @@ -0,0 +1 @@ +Fixed celery worker defaulting to development settings instead of production From 871db15908ae3873e288aca6e82bbe601c540fc0 Mon Sep 17 00:00:00 2001 From: Eliot Berriot Date: Fri, 25 Jan 2019 15:40:47 +0100 Subject: [PATCH 2/2] Upgraded kombu to fix an incompatibility with redis>=3 --- api/requirements/base.txt | 2 +- changes/changelog.d/kombu.bugfix | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 changes/changelog.d/kombu.bugfix diff --git a/api/requirements/base.txt b/api/requirements/base.txt index e770b3882..b05be4bff 100644 --- a/api/requirements/base.txt +++ b/api/requirements/base.txt @@ -21,7 +21,7 @@ pytz==2018.9 # Redis support django-redis>=4.10,<4.11 redis>=3.0,<3.1 - +kombu>=4.2.2,<4.3 celery>=4.2,<4.3 diff --git a/changes/changelog.d/kombu.bugfix b/changes/changelog.d/kombu.bugfix new file mode 100644 index 000000000..01469f29e --- /dev/null +++ b/changes/changelog.d/kombu.bugfix @@ -0,0 +1 @@ +Upgraded kombu to fix an incompatibility with redis>=3