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

Updated third-party requirements to latest versions.

Browse Source
This commit is contained in:
Chris Church
2013-08-27 23:20:47 -04:00
parent 415fbc5362
commit 8d16485f7f
205 changed files with 2878 additions and 2374 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
awx/lib/site-packages/celery/app/builtins.py
View File

@@ -307,8 +307,9 @@ def add_chord_task(app):
accept_magic_kwargs = False
ignore_result = False
def run(self, header, body, partial_args=(), interval=1, countdown=1,
max_retries=None, propagate=None, eager=False, **kwargs):
def run(self, header, body, partial_args=(), interval=None,
countdown=1, max_retries=None, propagate=None,
eager=False, **kwargs):
propagate = default_propagate if propagate is None else propagate
group_id = uuid()
AsyncResult = self.app.AsyncResult

12
awx/lib/site-packages/celery/app/task.py
View File

@@ -198,11 +198,11 @@ class Task(object):
serializer = None
#: Hard time limit.
#: Defaults to the :setting:`CELERY_TASK_TIME_LIMIT` setting.
#: Defaults to the :setting:`CELERYD_TASK_TIME_LIMIT` setting.
time_limit = None
#: Soft time limit.
#: Defaults to the :setting:`CELERY_TASK_SOFT_TIME_LIMIT` setting.
#: Defaults to the :setting:`CELERYD_TASK_SOFT_TIME_LIMIT` setting.
soft_time_limit = None
#: The result store backend used for this task.
@@ -459,7 +459,8 @@ class Task(object):
args = (self.__self__, ) + tuple(args)
if conf.CELERY_ALWAYS_EAGER:
return self.apply(args, kwargs, task_id=task_id, **options)
return self.apply(args, kwargs, task_id=task_id,
link=link, link_error=link_error, **options)
options = dict(extract_exec_options(self), **options)
options = router.route(options, self.name, args, kwargs)
@@ -580,7 +581,8 @@ class Task(object):
raise ret
return ret
def apply(self, args=None, kwargs=None, **options):
def apply(self, args=None, kwargs=None,
link=None, link_error=None, **options):
"""Execute this task locally, by blocking until the task returns.
:param args: positional arguments passed on to the task.
@@ -614,6 +616,8 @@ class Task(object):
'is_eager': True,
'logfile': options.get('logfile'),
'loglevel': options.get('loglevel', 0),
'callbacks': maybe_list(link),
'errbacks': maybe_list(link_error),
'delivery_info': {'is_eager': True}}
if self.accept_magic_kwargs:
default_kwargs = {'task_name': task.name,