kallithea Changeset - 191f3f08236d

Changeset - 191f3f08236d

Parent rev.

Child rev.

[Not reviewed]

beta

0 5 0

Marcin Kuzminski - 14 years ago 2011-10-11 01:08:23
marcin@python-works.com

fixes #258 RhodeCode 1.2 assumes egg folder is writable

5 files changed with 10 insertions and 9 deletions:

rhodecode/lib/celerylib/__init__.py

rhodecode/lib/celerylib/tasks.py

rhodecode/lib/indexers/__init__.py

rhodecode/lib/pidlock.py

rhodecode/lib/utils.py

0 comments (0 inline, 0 general)

rhodecode/lib/celerylib/__init__.py

➞

Show inline comments

@@ @@ -91,17 +91,17 @@ 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 = dn(dn(dn(os.path.abspath(__file__))))
+        lockkey_path = config['here']
         log.info('running task with lockkey %s', lockkey)
         try:
             l = DaemonLock(jn(lockkey_path, lockkey))
+            l = DaemonLock(file_=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

@@ @@ -94,16 +94,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__)))))
     lockkey_path = config['here']
     log.info('running task with lockkey %s', lockkey)
     try:
         lock = l = DaemonLock(jn(lockkey_path, lockkey))
+        lock = l = DaemonLock(file_=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

@@ @@ -98,13 +98,13 @@ class MakeIndex(BasePasterCommand): @@
         #======================================================================
         # WHOOSH DAEMON
         #======================================================================
         from rhodecode.lib.pidlock import LockHeld, DaemonLock
         from rhodecode.lib.indexers.daemon import WhooshIndexingDaemon
         try:
-            l = DaemonLock(file=jn(dn(dn(index_location)), 'make_index.lock'))
+            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/pidlock.py

➞

Show inline comments

@@ @@ -26,23 +26,23 @@ class LockHeld(Exception): @@
 class DaemonLock(object):
     """daemon locking
     USAGE:
     try:
         l = DaemonLock(desc='test lock')
+        l = DaemonLock(file_='/path/tolockfile',desc='test lock')
         main()
         l.release()
     except LockHeld:
         sys.exit(1)
     """
-    def __init__(self, file=None, callbackfn=None,
+    def __init__(self, file_=None, callbackfn=None,
                  desc='daemon lock', debug=False):
-        self.pidfile = file if file else os.path.join(
+        self.pidfile = file_ if file_ else os.path.join(
                                                     os.path.dirname(__file__),
                                                     'running.lock')
         self.callbackfn = callbackfn
         self.desc = desc
         self.debug = debug
         self.held = False

rhodecode/lib/utils.py

➞

Show inline comments

@@ @@ -483,13 +483,13 @@ def create_test_index(repo_location, con @@
     index_location = os.path.join(config['app_conf']['index_dir'])
     if not os.path.exists(index_location):
         os.makedirs(index_location)
     try:
-        l = DaemonLock(file=jn(dn(index_location), 'make_index.lock'))
+        l = DaemonLock(file_=jn(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)