kallithea Changeset - a38e05a0c79e

Changeset - a38e05a0c79e

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Mads Kiilerich - 6 years ago 2019-08-28 12:28:01
mads@kiilerich.com

Grafted from: 93164d6e8b19

tg2: handle cache_dir configuration jumping around between TurboGears versions

Tweak 87672c1916f8 - the use of 'tg.cache_dir' turns out to not be a good idea.

TurboGears 2.4 moved 'cache_dir' configuration to the expected 'cache_dir' key,
and no longer has 'tg.cache_dir' ... and also not the old
'app_conf'.'cache_dir' .

Just try both locations.

2 files changed with 2 insertions and 2 deletions:

kallithea/lib/celerylib/__init__.py

kallithea/lib/celerylib/tasks.py

0 comments (0 inline, 0 general)

kallithea/lib/celerylib/__init__.py

➞

Show inline comments

@@ @@ -102,7 +102,7 @@ def __get_lockkey(func, *fargs, **fkwarg @@
 def locked_task(func):
     def __wrapper(func, *fargs, **fkwargs):
         lockkey = __get_lockkey(func, *fargs, **fkwargs)
-        lockkey_path = config['tg.cache_dir']  # The configured cache_dir is only available under this name ...
+        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:

kallithea/lib/celerylib/tasks.py

➞

Show inline comments

@@ @@ -73,7 +73,7 @@ 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['tg.cache_dir']  # The configured cache_dir is only available under this name ...
+    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)

0 comments (0 inline, 0 general)