kallithea Changeset - ac32a026c306

Changeset - ac32a026c306

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Marcin Kuzminski - 15 years ago 2010-09-23 21:25:30
marcin@python-works.com

simplified task locking, and fixed some bugs for keyworded arguments

2 files changed with 10 insertions and 17 deletions:

pylons_app/lib/celerylib/__init__.py

pylons_app/lib/celerylib/tasks.py

0 comments (0 inline, 0 general)

pylons_app/lib/celerylib/__init__.py

➞

Show inline comments

@@ @@ -31,21 +31,14 @@ def run_task(task, *args, **kwargs): @@
         return ResultWrapper(task(*args, **kwargs))
 class LockTask(object):
     """LockTask decorator"""
     def __init__(self, func):
         self.func = func
     def __call__(self, func):
         return decorator(self.__wrapper, func)
     def __wrapper(self, func, *fargs, **fkwargs):
         params = []
         params.extend(fargs)
         params.extend(fkwargs.values())
 def locked_task(func):
     def __wrapper(func, *fargs, **fkwargs):
         params = list(fargs)
         params.extend(['%s-%s' % ar for ar in fkwargs.items()])
         lockkey = 'task_%s' % \
            md5(str(self.func) + '-' + '-'.join(map(str, params))).hexdigest()
             md5(str(func.__name__) + '-' + \
                 '-'.join(map(str, params))).hexdigest()
         log.info('running task with lockkey %s', lockkey)
         try:
             l = DaemonLock(lockkey)
@@ @@ -55,7 +48,7 @@ class LockTask(object): @@
             log.info('LockHeld')
             return 'Task with key %s already running' % lockkey
+    return decorator(__wrapper, func)

pylons_app/lib/celerylib/tasks.py

➞

Show inline comments

@@ @@ -2,7 +2,7 @@ from celery.decorators import task @@
 from celery.task.sets import subtask
 from celeryconfig import PYLONS_CONFIG as config
 from pylons.i18n.translation import _
-from pylons_app.lib.celerylib import run_task, LockTask
+from pylons_app.lib.celerylib import run_task, locked_task
 from pylons_app.lib.helpers import person
 from pylons_app.lib.smtp_mailer import SmtpMailer
 from pylons_app.lib.utils import OrderedDict
@@ @@ -82,7 +82,7 @@ def whoosh_index(repo_location, full_ind @@
 @task
-@LockTask('get_commits_stats')
+@locked_task
 def get_commits_stats(repo_name, ts_min_y, ts_max_y):
     author_key_cleaner = lambda k: person(k).replace('"', "") #for js data compatibilty

0 comments (0 inline, 0 general)