kallithea Changeset - 5aa9fa97306f

Changeset - 5aa9fa97306f

Parent rev.

Child rev.

[Not reviewed]

default

0 5 0

Mads Kiilerich - 8 years ago 2017-08-12 17:40:01
mads@kiilerich.com

lib: make the DaemonLock lock location parameter mandatory - the default was never used

5 files changed with 7 insertions and 9 deletions:

kallithea/lib/celerylib/__init__.py

kallithea/lib/celerylib/tasks.py

kallithea/lib/paster_commands/make_index.py

kallithea/lib/pidlock.py

kallithea/tests/fixture.py

0 comments (0 inline, 0 general)

kallithea/lib/celerylib/__init__.py

➞

Show inline comments

@@ @@ -100,25 +100,25 @@ def __get_lockkey(func, *fargs, **fkwarg @@
     lockkey = 'task_%s.lock' % \
         md5(func_name + '-' + '-'.join(map(safe_str, params))).hexdigest()
     return lockkey
 def locked_task(func):
     def __wrapper(func, *fargs, **fkwargs):
         lockkey = __get_lockkey(func, *fargs, **fkwargs)
         lockkey_path = config['app_conf']['cache_dir']
         log.info('running task with lockkey %s', lockkey)
         try:
-            l = DaemonLock(file_=os.path.join(lockkey_path, lockkey))
             l = DaemonLock(os.path.join(lockkey_path, 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():
     if CELERY_ON:

kallithea/lib/celerylib/tasks.py

➞

Show inline comments

@@ @@ -73,25 +73,25 @@ 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']
     log.info('running task with lockkey %s', lockkey)
     try:
-        lock = l = celerylib.DaemonLock(file_=os.path.join(lockkey_path, lockkey))
         lock = celerylib.DaemonLock(os.path.join(lockkey_path, lockkey))
         # for js data compatibility cleans the key for person from '
         akc = lambda k: person(k).replace('"', "")
         co_day_auth_aggr = {}
         commits_by_day_aggregate = {}
         repo = Repository.get_by_repo_name(repo_name)
         if repo is None:
             return True
         repo = repo.scm_instance
         repo_size = repo.count()

kallithea/lib/paster_commands/make_index.py

➞

Show inline comments

@@ @@ -48,25 +48,25 @@ class Command(BasePasterCommand): @@
         repo_list = map(strip, args.repo_list.split(',')) \
             if args.repo_list else None
         repo_update_list = map(strip, args.repo_update_list.split(',')) \
             if args.repo_update_list else None
         #======================================================================
         # WHOOSH DAEMON
         #======================================================================
         from kallithea.lib.pidlock import LockHeld, DaemonLock
         from kallithea.lib.indexers.daemon import WhooshIndexingDaemon
         try:
-            l = DaemonLock(file_=os.path.join(index_location, 'make_index.lock'))
             l = DaemonLock(os.path.join(index_location, 'make_index.lock'))
             WhooshIndexingDaemon(index_location=index_location,
                                  repo_location=repo_location,
                                  repo_list=repo_list,
                                  repo_update_list=repo_update_list) \
                 .run(full_index=args.full_index)
             l.release()
         except LockHeld:
             sys.exit(1)
     def get_parser(self, prog_name):
         parser = super(Command, self).get_parser(prog_name)

kallithea/lib/pidlock.py

➞

Show inline comments

@@ @@ -19,36 +19,34 @@ from multiprocessing.util import Finaliz @@
 from kallithea.lib.compat import kill
 class LockHeld(Exception):
     pass
 class DaemonLock(object):
     """daemon locking
     USAGE:
     try:
-        l = DaemonLock(file_='/path/tolockfile',desc='test lock')
         l = DaemonLock('/path/tolockfile',desc='test lock')
         main()
         l.release()
     except LockHeld:
         sys.exit(1)
     """
-    def __init__(self, file_=None, callbackfn=None,
     def __init__(self, file_, callbackfn=None,
                  desc='daemon lock', debug=False):
         lock_name = os.path.join(os.path.dirname(__file__), 'running.lock')
         self.pidfile = file_ if file_ else lock_name
         self.pidfile = file_
         self.callbackfn = callbackfn
         self.desc = desc
         self.debug = debug
         self.held = False
         #run the lock automatically !
         self.lock()
         self._finalize = Finalize(self, DaemonLock._on_finalize,
                                   args=(self, debug), exitpriority=10)
     @staticmethod
     def _on_finalize(lock, debug):
         if lock.held:

kallithea/tests/fixture.py

➞

Show inline comments

@@ @@ -402,17 +402,17 @@ def create_test_env(repos_test_path, con @@
 def create_test_index(repo_location, config, full_index):
     """
     Makes default test index
     """
     from kallithea.lib.indexers.daemon import WhooshIndexingDaemon
     from kallithea.lib.pidlock import DaemonLock, LockHeld
     index_location = os.path.join(config['index_dir'])
     if not os.path.exists(index_location):
         os.makedirs(index_location)
-    l = DaemonLock(file_=os.path.join(index_location, 'make_index.lock'))
     l = DaemonLock(os.path.join(index_location, 'make_index.lock'))
     WhooshIndexingDaemon(index_location=index_location,
                          repo_location=repo_location) \
         .run(full_index=full_index)
     l.release()

0 comments (0 inline, 0 general)