kallithea Changeset - 569feabd3c9d

Changeset - 569feabd3c9d

Parent rev.

Child rev.

[Not reviewed]

default

0 4 0

Thomas De Schampheleire - 9 years ago 2016-08-21 13:43:06
thomas.de.schampheleire@gmail.com

utils: rename add_cache to setup_cache_regions

Rename method 'add_cache' to something that better describes what it
actually does.

4 files changed with 7 insertions and 7 deletions:

kallithea/lib/celerylib/tasks.py

kallithea/lib/paster_commands/common.py

kallithea/lib/utils.py

kallithea/tests/scripts/manual_test_concurrency.py

0 comments (0 inline, 0 general)

kallithea/lib/celerylib/tasks.py

➞

Show inline comments

@@ @@ -41,21 +41,21 @@ from pylons import config @@
 from kallithea import CELERY_ON
 from kallithea.lib.celerylib import run_task, locked_task, dbsession, \
     str2bool, __get_lockkey, LockHeld, DaemonLock, get_session
 from kallithea.lib.helpers import person
 from kallithea.lib.rcmail.smtp_mailer import SmtpMailer
-from kallithea.lib.utils import add_cache, action_logger
+from kallithea.lib.utils import setup_cache_regions, action_logger
 from kallithea.lib.vcs.utils import author_email
 from kallithea.lib.compat import json, OrderedDict
 from kallithea.lib.hooks import log_create_repository
 from kallithea.model.db import Statistics, Repository, User
-add_cache(config)  # pragma: no cover
+setup_cache_regions(config)  # pragma: no cover
 __all__ = ['whoosh_index', 'get_commits_stats', 'send_email']
 def get_logger(cls):
     if CELERY_ON:

kallithea/lib/paster_commands/common.py

➞

Show inline comments

@@ @@ -28,13 +28,13 @@ Original author and date, and relevant c @@
 import os
 import logging
 import paste
 from paste.script.command import Command, BadCommand
-from kallithea.lib.utils import add_cache
+from kallithea.lib.utils import setup_cache_regions
 def ask_ok(prompt, retries=4, complaint='Yes or no please!'):
     while True:
         ok = raw_input(prompt)
         if ok in ('y', 'ye', 'yes'):
@@ @@ -105,9 +105,9 @@ class BasePasterCommand(Command): @@
         """
         logging.config.fileConfig(self.path_to_ini_file)
         from pylons import config
         from kallithea.model import init_model
         from kallithea.lib.utils2 import engine_from_config
-        add_cache(config)
+        setup_cache_regions(config)
         engine = engine_from_config(config, 'sqlalchemy.db1.')
         init_model(engine)

kallithea/lib/utils.py

➞

Show inline comments

@@ @@ -744,13 +744,13 @@ def jsonify(func, *args, **kwargs): @@
 #===============================================================================
 # CACHE RELATED METHODS
 #===============================================================================
 # set cache regions for beaker so celery can utilise it
-def add_cache(settings):
+def setup_cache_regions(settings):
     cache_settings = {'regions': None}
     for key in settings.keys():
         for prefix in ['beaker.cache.', 'cache.']:
             if key.startswith(prefix):
                 name = key.split(prefix)[1].strip()
                 cache_settings[name] = settings[key].strip()

kallithea/tests/scripts/manual_test_concurrency.py

➞

Show inline comments

@@ @@ -35,26 +35,26 @@ from os.path import dirname @@
 from tempfile import _RandomNameSequence
 from subprocess import Popen, PIPE
 from paste.deploy import appconfig
 from sqlalchemy import engine_from_config
-from kallithea.lib.utils import add_cache
+from kallithea.lib.utils import setup_cache_regions
 from kallithea.model import init_model
 from kallithea.model import meta
 from kallithea.model.db import User, Repository, Ui
 from kallithea.lib.auth import get_crypt_password
 from kallithea.tests import HG_REPO
 from kallithea.config.environment import load_environment
 rel_path = dirname(dirname(dirname(dirname(os.path.abspath(__file__)))))
 conf = appconfig('config:development.ini', relative_to=rel_path)
 load_environment(conf.global_conf, conf.local_conf)
-add_cache(conf)
+setup_cache_regions(conf)
 USER = TEST_USER_ADMIN_LOGIN
 PASS = TEST_USER_ADMIN_PASS
 HOST = 'server.local'
 METHOD = 'pull'
 DEBUG = True

0 comments (0 inline, 0 general)