External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-14 21:07:39 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2461 from ryanpetrello/upgrade-celery-and-kombu

Browse Source 
upgrade to the latest kombu + celery

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
This commit is contained in:
softwarefactory-project-zuul[bot]
2018-10-17 13:49:37 +00:00
committed by GitHub
parent 6c868c7552 79002ae563
commit 78c4d5005e
3 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
awx/main/management/commands/run_dispatcher.py
View File

@@ -35,7 +35,7 @@ class Command(BaseCommand):
'running jobs will run to completion first')) 'running jobs will run to completion first'))
def beat(self): def beat(self):
from celery import app from celery import Celery
from celery.beat import PersistentScheduler from celery.beat import PersistentScheduler
from celery.apps import beat from celery.apps import beat
@@ -56,7 +56,7 @@ class Command(BaseCommand):
raise SystemExit() raise SystemExit()
return super(AWXScheduler, self).tick(*args, **kwargs) return super(AWXScheduler, self).tick(*args, **kwargs)
def apply_async(self, entry, publisher, **kwargs): def apply_async(self, entry, producer=None, advance=True, **kwargs):
task = TaskWorker.resolve_callable(entry.task) task = TaskWorker.resolve_callable(entry.task)
result, queue = task.apply_async() result, queue = task.apply_async()
@@ -65,7 +65,7 @@ class Command(BaseCommand):
return TaskResult() return TaskResult()
app = app.App() app = Celery()
app.conf.BROKER_URL = settings.BROKER_URL app.conf.BROKER_URL = settings.BROKER_URL
app.conf.CELERY_TASK_RESULT_EXPIRES = False app.conf.CELERY_TASK_RESULT_EXPIRES = False
beat.Beat( beat.Beat(

2
requirements/requirements.in
View File

@@ -4,7 +4,7 @@ asgiref==1.1.2
backports.ssl-match-hostname==3.5.0.1 backports.ssl-match-hostname==3.5.0.1
boto==2.47.0 boto==2.47.0
channels==1.1.8 channels==1.1.8
celery==3.1.25 celery==4.2.1
daphne==1.3.0 # Last before backwards-incompatible channels 2 upgrade daphne==1.3.0 # Last before backwards-incompatible channels 2 upgrade
decorator==4.2.1 decorator==4.2.1
Django==1.11.11 Django==1.11.11

11
requirements/requirements.txt
View File

@@ -4,8 +4,7 @@
# #
# pip-compile --output-file requirements/requirements.txt requirements/requirements.in # pip-compile --output-file requirements/requirements.txt requirements/requirements.in
# #
amqp==1.4.9 # via kombu amqp==2.3.2 # via kombu
anyjson==0.3.3 # via kombu
appdirs==1.4.2 appdirs==1.4.2
argparse==1.4.0 # via uwsgitop argparse==1.4.0 # via uwsgitop
asgi-amqp==1.1.2 asgi-amqp==1.1.2
@@ -17,9 +16,9 @@ automat==0.6.0 # via twisted
backports.functools-lru-cache==1.5 # via jaraco.functools backports.functools-lru-cache==1.5 # via jaraco.functools
backports.ssl-match-hostname==3.5.0.1 backports.ssl-match-hostname==3.5.0.1
baron==0.6.6 # via redbaron baron==0.6.6 # via redbaron
billiard==3.3.0.23 # via celery billiard==3.5.0.4 # via celery
boto==2.47.0 boto==2.47.0
celery==3.1.25 celery==4.2.1
cffi==1.11.5 # via cryptography cffi==1.11.5 # via cryptography
channels==1.1.8 channels==1.1.8
constantly==15.1.0 # via twisted constantly==15.1.0 # via twisted
@@ -60,7 +59,7 @@ jaraco.stream==1.1.2 # via irc
jaraco.text==1.10 # via irc, jaraco.collections jaraco.text==1.10 # via irc, jaraco.collections
jsonpickle==0.9.6 # via asgi-amqp jsonpickle==0.9.6 # via asgi-amqp
jsonschema==2.6.0 jsonschema==2.6.0
kombu==3.0.37 # via asgi-amqp, celery kombu==4.2.1 # via asgi-amqp, celery
lxml==4.2.3 lxml==4.2.3
m2crypto==0.29.0 m2crypto==0.29.0
markdown==2.6.11 markdown==2.6.11
@@ -89,7 +88,7 @@ python-memcached==1.59
python-openid==2.2.5 # via social-auth-core python-openid==2.2.5 # via social-auth-core
python-radius==1.0 python-radius==1.0
python-saml==2.4.0 python-saml==2.4.0
pytz==2018.3 # via celery, django, irc, tempora, twilio pytz==2018.5 # via celery, django, irc, tempora, twilio
pyyaml==3.12 # via djangorestframework-yaml pyyaml==3.12 # via djangorestframework-yaml
redbaron==0.6.3 redbaron==0.6.3
requests-futures==0.9.7 requests-futures==0.9.7