MirrorMirror
/
funkwhale
mirror of https://dev.funkwhale.audio/funkwhale/funkwhale.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix-celery-issues' into 'master' 

Fix celery issues

See merge request funkwhale/funkwhale!563
This commit is contained in:
Eliot Berriot 2019-01-25 15:44:00 +01:00
parent 293e526f2f 871db15908
commit 22a38260e6
4 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/funkwhale_api/taskapp/celery.py
View File

@ -14,7 +14,7 @@ logger = logging.getLogger("celery")
if not settings.configured: if not settings.configured:
# set the default Django settings module for the 'celery' program. # set the default Django settings module for the 'celery' program.
os.environ.setdefault( os.environ.setdefault(
"DJANGO_SETTINGS_MODULE", "config.settings.local" "DJANGO_SETTINGS_MODULE", "config.settings.production"
) # pragma: no cover ) # pragma: no cover
app = celery.Celery("funkwhale_api") app = celery.Celery("funkwhale_api")

2
api/requirements/base.txt
View File

@ -21,7 +21,7 @@ pytz==2018.9
# Redis support # Redis support
django-redis>=4.10,<4.11 django-redis>=4.10,<4.11
redis>=3.0,<3.1 redis>=3.0,<3.1
kombu>=4.2.2,<4.3
celery>=4.2,<4.3 celery>=4.2,<4.3

1
changes/changelog.d/celery.bugfix Normal file
View File

@ -0,0 +1 @@
Fixed celery worker defaulting to development settings instead of production

1
changes/changelog.d/kombu.bugfix Normal file
View File

@ -0,0 +1 @@
Upgraded kombu to fix an incompatibility with redis>=3