kallithea Changeset - 1b683a4eb9fc

Changeset - 1b683a4eb9fc

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Mads Kiilerich (mads) - 5 years ago 2020-12-28 00:43:18
mads@kiilerich.com

Grafted from: b6354f238d1b

TurboGears: drop workaround for < 2.4

Backout a38e05a0c79e and tweak.

2 files changed with 2 insertions and 7 deletions:

kallithea/lib/celerylib/__init__.py

kallithea/model/async_tasks.py

0 comments (0 inline, 0 general)

kallithea/lib/celerylib/__init__.py

➞

Show inline comments

@@ @@ -92,29 +92,27 @@ def __get_lockkey(func, *fargs, **fkwarg @@
     params.extend(['%s-%s' % ar for ar in fkwargs.items()])
     func_name = str(func.__name__) if hasattr(func, '__name__') else str(func)
     lockkey = 'task_%s.lock' % \
         sha1(safe_bytes(func_name + '-' + '-'.join(str(x) for x in params))).hexdigest()
     return lockkey
 def locked_task(func):
     def __wrapper(func, *fargs, **fkwargs):
         lockkey = __get_lockkey(func, *fargs, **fkwargs)
         lockkey_path = config.get('cache_dir') or config['app_conf']['cache_dir']  # Backward compatibility for TurboGears < 2.4
         log.info('running task with lockkey %s', lockkey)
         try:
-            l = DaemonLock(os.path.join(lockkey_path, lockkey))
+            l = DaemonLock(os.path.join(config['cache_dir'], lockkey))
             ret = func(*fargs, **fkwargs)
             l.release()
             return ret
         except LockHeld:
             log.info('LockHeld')
             return 'Task with key %s already running' % lockkey
     return decorator(__wrapper, func)
 def get_session():
     sa = meta.Session()

kallithea/model/async_tasks.py

➞

Show inline comments

@@ @@ -75,30 +75,27 @@ def _author_username(author): @@
         if user is not None:
             return user.username
     # Still nothing?  Just pass back the author name if any, else the email
     return author_name(author) or email
 @celerylib.task
 @celerylib.dbsession
 def get_commits_stats(repo_name, ts_min_y, ts_max_y, recurse_limit=100):
     DBS = celerylib.get_session()
     lockkey = celerylib.__get_lockkey('get_commits_stats', repo_name, ts_min_y,
                             ts_max_y)
     lockkey_path = config.get('cache_dir') or config['app_conf']['cache_dir']  # Backward compatibility for TurboGears < 2.4
     log.info('running task with lockkey %s', lockkey)
     try:
-        lock = celerylib.DaemonLock(os.path.join(lockkey_path, lockkey))
+        lock = celerylib.DaemonLock(os.path.join(config['cache_dir'], lockkey))
         co_day_auth_aggr = {}
         commits_by_day_aggregate = {}
         db_repo = db.Repository.get_by_repo_name(repo_name)
         if db_repo is None:
             return True
         scm_repo = db_repo.scm_instance
         repo_size = scm_repo.count()
         # return if repo have no revisions
         if repo_size < 1:
             lock.release()

0 comments (0 inline, 0 general)