kallithea Changeset - d280aa1c85c6

Changeset - d280aa1c85c6

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Marcin Kuzminski - 15 years ago 2010-09-25 20:17:56
marcin@python-works.com

removed pidlock from whoosh and added it as locked_task decorator

2 files changed with 6 insertions and 37 deletions:

pylons_app/lib/celerylib/tasks.py

pylons_app/lib/pidlock.py

0 comments (0 inline, 0 general)

pylons_app/lib/celerylib/tasks.py

➞

Show inline comments

@@ @@ -57,38 +57,29 @@ def get_hg_ui_settings(): @@
         if k.find('.') != -1:
             k = k.replace('.', '_')
         if each.ui_section == 'hooks':
             v = each.ui_active
         settings[each.ui_section + '_' + k] = v
     return settings
 @task
 @locked_task
 def whoosh_index(repo_location, full_index):
     log = whoosh_index.get_logger()
     from pylons_app.lib.pidlock import DaemonLock
     from pylons_app.lib.indexers.daemon import WhooshIndexingDaemon, LockHeld
     try:
         l = DaemonLock()
         WhooshIndexingDaemon(repo_location=repo_location)\
             .run(full_index=full_index)
         l.release()
         return 'Done'
     except LockHeld:
         log.info('LockHeld')
         return 'LockHeld'
     from pylons_app.lib.indexers.daemon import WhooshIndexingDaemon
     WhooshIndexingDaemon(repo_location=repo_location).run(full_index=full_index)
 @task
 @locked_task
 def get_commits_stats(repo_name, ts_min_y, ts_max_y):
     author_key_cleaner = lambda k: person(k).replace('"', "") #for js data compatibilty
     from pylons_app.model.db import Statistics, Repository
     log = get_commits_stats.get_logger()
     commits_by_day_author_aggregate = {}
     commits_by_day_aggregate = {}
     repos_path = get_hg_ui_settings()['paths_root_path'].replace('*', '')
     repo = MercurialRepository(repos_path + repo_name)

pylons_app/lib/pidlock.py

➞

Show inline comments

 import os, time
 import sys
 from warnings import warn
 class LockHeld(Exception):pass
 class DaemonLock(object):
     """daemon locking
     USAGE:
     try:
-        l = lock()
+        l = DaemonLock(desc='test lock')
         main()
         l.release()
     except LockHeld:
         sys.exit(1)
     """
     def __init__(self, file=None, callbackfn=None,
                  desc='daemon lock', debug=False):
         self.pidfile = file if file else os.path.join(os.path.dirname(__file__),
                                                       'running.lock')
         self.callbackfn = callbackfn
@@ @@ -31,26 +31,25 @@ class DaemonLock(object): @@
     def __del__(self):
         if self.held:
 #            warn("use lock.release instead of del lock",
 #                    category = DeprecationWarning,
 #                    stacklevel = 2)
             # ensure the lock will be removed
             self.release()
     def lock(self):
         """
         locking function, if lock is present it will raise LockHeld exception
         """locking function, if lock is present it will raise LockHeld exception
         """
         lockname = '%s' % (os.getpid())
         self.trylock()
         self.makelock(lockname, self.pidfile)
         return True
     def trylock(self):
         running_pid = False
         try:
             pidfile = open(self.pidfile, "r")
             pidfile.seek(0)
@@ @@ -66,26 +65,25 @@ class DaemonLock(object): @@
                         print "It is running as process %s" % running_pid
                         raise LockHeld
                 else:
                         print "Lock File is there but the program is not running"
                         print "Removing lock file for the: %s" % running_pid
                         self.release()
         except IOError, e:
             if e.errno != 2:
                 raise
     def release(self):
         """
         releases the pid by removing the pidfile
         """releases the pid by removing the pidfile
         """
         if self.callbackfn:
             #execute callback function on release
             if self.debug:
                 print 'executing callback function %s' % self.callbackfn
             self.callbackfn()
         try:
             if self.debug:
                 print 'removing pidfile %s' % self.pidfile
             os.remove(self.pidfile)
             self.held = False
         except OSError, e:
@@ @@ -96,32 +94,12 @@ class DaemonLock(object): @@
     def makelock(self, lockname, pidfile):
         """
         this function will make an actual lock
         @param lockname: acctual pid of file
         @param pidfile: the file to write the pid in
         """
         if self.debug:
             print 'creating a file %s and pid: %s' % (pidfile, lockname)
         pidfile = open(self.pidfile, "wb")
         pidfile.write(lockname)
         pidfile.close
         self.held = True
 def main():
     print 'func is running'
     cnt = 20
     while 1:
         print cnt
         if cnt == 0:
             break
         time.sleep(1)
         cnt -= 1
 if __name__ == "__main__":
     try:
         l = DaemonLock(desc='test lock')
         main()
         l.release()
     except LockHeld:
         sys.exit(1)

0 comments (0 inline, 0 general)