kallithea Changeset - ed309b1fbaa4

Changeset - ed309b1fbaa4

Parent rev.

Child rev.

[Not reviewed]

beta

0 4 0

Marcin Kuzminski - 14 years ago 2011-06-03 13:44:10
marcin@python-works.com

fixes issue #197 Relative paths for pidlocks

4 files changed with 12 insertions and 5 deletions:

rhodecode/lib/celerylib/__init__.py

rhodecode/lib/celerylib/tasks.py

rhodecode/lib/indexers/__init__.py

rhodecode/lib/utils.py

0 comments (0 inline, 0 general)

rhodecode/lib/celerylib/__init__.py

➞

Show inline comments

@@ @@ -25,12 +25,13 @@ @@
 import os
 import sys
 import socket
 import traceback
 import logging
 from os.path import dirname as dn, join as jn
 from hashlib import md5
 from decorator import decorator
 from pylons import  config
 from vcs.utils.lazy import LazyProperty
@@ @@ -82,23 +83,25 @@ def run_task(task, *args, **kwargs): @@
 def __get_lockkey(func, *fargs, **fkwargs):
     params = list(fargs)
     params.extend(['%s-%s' % ar for ar in fkwargs.items()])
     func_name = str(func.__name__) if hasattr(func, '__name__') else str(func)
     lockkey = 'task_%s' % \
+    lockkey = 'task_%s.lock' % \
         md5(func_name + '-' + '-'.join(map(str, params))).hexdigest()
     return lockkey
 def locked_task(func):
     def __wrapper(func, *fargs, **fkwargs):
         lockkey = __get_lockkey(func, *fargs, **fkwargs)
         lockkey_path = dn(dn(dn(os.path.abspath(__file__))))
         log.info('running task with lockkey %s', lockkey)
         try:
             l = DaemonLock(lockkey)
+            l = DaemonLock(jn(lockkey_path, lockkey))
             ret = func(*fargs, **fkwargs)
             l.release()
             return ret
         except LockHeld:
             log.info('LockHeld')
             return 'Task with key %s already running' % lockkey

rhodecode/lib/celerylib/tasks.py

➞

Show inline comments

@@ @@ -25,12 +25,13 @@ @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 from celery.decorators import task
 import os
 import traceback
 import logging
 from os.path import dirname as dn, join as jn
 from time import mktime
 from operator import itemgetter
 from string import lower
 from pylons import config
@@ @@ -97,15 +98,17 @@ def get_commits_stats(repo_name, ts_min_ @@
         log = get_commits_stats.get_logger()
     except:
         log = logging.getLogger(__name__)
     lockkey = __get_lockkey('get_commits_stats', repo_name, ts_min_y,
                             ts_max_y)
     lockkey_path = dn(dn(dn(dn(os.path.abspath(__file__)))))
     print jn(lockkey_path, lockkey)
     log.info('running task with lockkey %s', lockkey)
     try:
         lock = DaemonLock(lockkey)
+        lock = l = DaemonLock(jn(lockkey_path, lockkey))
         #for js data compatibilty cleans the key for person from '
         akc = lambda k: person(k).replace('"', "")
         co_day_auth_aggr = {}
         commits_by_day_aggregate = {}

rhodecode/lib/indexers/__init__.py

➞

Show inline comments

@@ @@ -96,13 +96,13 @@ class MakeIndex(BasePasterCommand): @@
         #======================================================================
         # WHOOSH DAEMON
         #======================================================================
         from rhodecode.lib.pidlock import LockHeld, DaemonLock
         from rhodecode.lib.indexers.daemon import WhooshIndexingDaemon
         try:
             l = DaemonLock()
+            l = DaemonLock(file=jn(dn(dn(index_location)), 'make_index.lock'))
             WhooshIndexingDaemon(index_location=index_location,
                                  repo_location=repo_location,
                                  repo_list=repo_list)\
                 .run(full_index=self.options.full_index)
             l.release()
         except LockHeld:

rhodecode/lib/utils.py

➞

Show inline comments

@@ @@ -26,12 +26,13 @@ @@
 import os
 import logging
 import datetime
 import traceback
 import paste
 import beaker
 from os.path import dirname as dn, join as jn
 from paste.script.command import Command, BadCommand
 from UserDict import DictMixin
 from mercurial import ui, config, hg
@@ @@ -467,13 +468,13 @@ def create_test_index(repo_location, ful @@
     index_location = os.path.join(repo_location, 'index')
     if os.path.exists(index_location):
         shutil.rmtree(index_location)
     try:
         l = DaemonLock()
+        l = DaemonLock(file=jn(dn(dn(index_location)), 'make_index.lock'))
         WhooshIndexingDaemon(index_location=index_location,
                              repo_location=repo_location)\
             .run(full_index=full_index)
         l.release()
     except LockHeld:
         pass

0 comments (0 inline, 0 general)