# HG changeset patch
# User Mads Kiilerich <mads@kiilerich.com>
# Date 2020-12-28 00:43:18
# Node ID 1b683a4eb9fc724deda468bc0adcb1050a92845b
# Parent  4a18e6bf6b877ec1a06d302076b546fa2c53ecad

TurboGears: drop workaround for < 2.4

Backout a38e05a0c79e and tweak.

diff --git a/kallithea/lib/celerylib/__init__.py b/kallithea/lib/celerylib/__init__.py
--- a/kallithea/lib/celerylib/__init__.py
+++ b/kallithea/lib/celerylib/__init__.py
@@ -101,11 +101,9 @@ def __get_lockkey(func, *fargs, **fkwarg
 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
diff --git a/kallithea/model/async_tasks.py b/kallithea/model/async_tasks.py
--- a/kallithea/model/async_tasks.py
+++ b/kallithea/model/async_tasks.py
@@ -84,12 +84,9 @@ def get_commits_stats(repo_name, ts_min_
     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 = {}