kallithea Changeset - 87672c1916f8

Changeset - 87672c1916f8

Parent rev.

Child rev.

[Not reviewed]

default

0 5 0

Mads Kiilerich - 6 years ago 2019-07-22 04:38:22
mads@kiilerich.com

config: stop using the app_conf sub key - TurboGears2 2.4 will drop it

All [app:main] settings *except* cache_dir are also available at the top level. cache_dir can be found as tg.cache_dir .

5 files changed with 8 insertions and 10 deletions:

kallithea/config/app_cfg.py

kallithea/controllers/search.py

kallithea/lib/celerylib/__init__.py

kallithea/lib/celerylib/tasks.py

kallithea/tests/functional/test_search.py

0 comments (0 inline, 0 general)

kallithea/config/app_cfg.py

➞

Show inline comments

@@ @@ -153,14 +153,14 @@ def setup_configuration(app): @@
                       'Expected database version id(s): %s\n'
                       'If you are a developer and you know what you are doing, you can add `ignore_alembic_revision = True` '
                       'to your .ini file to skip the check.\n' % (' '.join(current_heads), ' '.join(available_heads)))
             sys.exit(1)
     # store some globals into kallithea
     kallithea.CELERY_ON = str2bool(config['app_conf'].get('use_celery'))
     kallithea.CELERY_EAGER = str2bool(config['app_conf'].get('celery.always.eager'))
     kallithea.CELERY_ON = str2bool(config.get('use_celery'))
     kallithea.CELERY_EAGER = str2bool(config.get('celery.always.eager'))
     kallithea.CONFIG = config
     load_rcextensions(root_path=config['here'])
     set_available_permissions(config)
     repos_path = make_ui().configitems('paths')[0][1]

kallithea/controllers/search.py

➞

Show inline comments

@@ @@ -81,13 +81,13 @@ class SearchController(BaseRepoControlle @@
             cur_query = c.cur_query.lower()
             log.debug(cur_query)
         if c.cur_query:
             p = safe_int(request.GET.get('page'), 1)
             highlight_items = set()
-            index_dir = config['app_conf']['index_dir']
             index_dir = config['index_dir']
             try:
                 if not exists_in(index_dir, index_name):
                     raise EmptyIndexError
                 idx = open_dir(index_dir, indexname=index_name)
                 searcher = idx.searcher()

kallithea/lib/celerylib/__init__.py

➞

Show inline comments

@@ @@ -101,13 +101,13 @@ def __get_lockkey(func, *fargs, **fkwarg @@
     return lockkey
 def locked_task(func):
     def __wrapper(func, *fargs, **fkwargs):
         lockkey = __get_lockkey(func, *fargs, **fkwargs)
-        lockkey_path = config['app_conf']['cache_dir']
+        lockkey_path = config['tg.cache_dir']  # The configured cache_dir is only available under this name ...
         log.info('running task with lockkey %s', lockkey)
         try:
             l = DaemonLock(os.path.join(lockkey_path, lockkey))
             ret = func(*fargs, **fkwargs)
             l.release()

kallithea/lib/celerylib/tasks.py

➞

Show inline comments

@@ @@ -72,13 +72,13 @@ def whoosh_index(repo_location, full_ind @@
 @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['app_conf']['cache_dir']
+    lockkey_path = config['tg.cache_dir']  # The configured cache_dir is only available under this name ...
     log.info('running task with lockkey %s', lockkey)
     try:
         lock = celerylib.DaemonLock(os.path.join(lockkey_path, lockkey))
@@ @@ -96,13 +96,13 @@ def get_commits_stats(repo_name, ts_min_ @@
         # return if repo have no revisions
         if repo_size < 1:
             lock.release()
             return True
         skip_date_limit = True
-        parse_limit = int(config['app_conf'].get('commit_parse_limit'))
         parse_limit = int(config.get('commit_parse_limit'))
         last_rev = None
         last_cs = None
         timegetter = itemgetter('time')
         dbrepo = DBS.query(Repository) \
             .filter(Repository.repo_name == repo_name).scalar()

kallithea/tests/functional/test_search.py

➞

Show inline comments

@@ @@ -13,16 +13,14 @@ class TestSearchController(TestControlle @@
         # Test response...
     def test_empty_search(self, tmpdir):
         self.log_user()
         config_mock = {
             'app_conf': {
                 # can be any existing dir that does not contain an actual index
                 'index_dir': str(tmpdir),
+            }
             # can be any existing dir that does not contain an actual index
             'index_dir': str(tmpdir),
+        }
         with mock.patch('kallithea.controllers.search.config', config_mock):
             response = self.app.get(url(controller='search', action='index'),
                                     {'q': HG_REPO})
             response.mustcontain('The server has no search index.')

0 comments (0 inline, 0 general)