##// END OF EJS Templates
Migrate to Mergely 3.3.4....
Migrate to Mergely 3.3.4. RhodeCode 2.2.5 distributed Mergely 3.3.4 with some of the changes that Mergely 3.3.3 in RhodeCode 1.7.2 also had. That do however not seem to be changes we want for Kallithea this way and we take the 3.3.4 files as they are. I've also included the Mergely license file, as downloaded from: http://www.mergely.com/license.php That LICENSE file is kept in HTML just as it was downloaded from their website. While it's a bit annoying to keep the license file in HTML, this is the way it came from upstream so we'll leave it that way. Since the Javascript code is used with other GPLv3 Javascript, we are using the GPL option of Mergely's tri-license. Finally, note that previously, this was incorrectly called "mergerly", so the opportunity is taken here to correct the name. That required changes to diff_2way.html. As commands:: $ wget -N --output-document LICENSE-MERGELY.html http://www.mergely.com/license.php $ hg add LICENSE-MERGELY.html $ hg mv rhodecode/public/css/mergerly.css rhodecode/public/css/mergely.css $ hg mv rhodecode/public/js/mergerly.js rhodecode/public/js/mergely.js $ sed -i 's,mergerly\.,mergely,g' rhodecode/templates/files/diff_2way.html $ ( cd /tmp; \ wget -N http://www.mergely.com/releases/mergely-3.3.4.zip; \ unzip mergely-3.3.4.zip ) $ sha256sum /tmp/mergely-3.3.4.zip 87415d30494bbe829c248881aa7cdc0303f7e70b458a5f687615564d4498cc82 mergely-3.3.4.zip $ cp /tmp/mergely-3.3.4/lib/mergely.js rhodecode/public/js/mergely.js $ cp /tmp/mergely-3.3.4/lib/mergely.css rhodecode/public/css/mergely.css $ sed -i -e '/^ \* Version/a\ *\n * NOTE by bkuhn@sfconservancy.org for Kallithea:\n * Mergely license appears at http://www.mergely.com/license.php and in LICENSE-MERGELY.html' rhodecode/public/js/mergely.js rhodecode/public/css/mergely.css

File last commit:

r4116:ffd45b18 rhodecode-2.2.5-gpl
r4125:aa3b5594 rhodecode-2.2.5-gpl
Show More
pidlock.py
144 lines | 4.5 KiB | text/x-python | PythonLexer
# -*- coding: utf-8 -*-
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
from __future__ import with_statement
import os
import errno
from multiprocessing.util import Finalize
from rhodecode.lib.compat import kill
class LockHeld(Exception):
pass
class DaemonLock(object):
"""daemon locking
USAGE:
try:
l = DaemonLock(file_='/path/tolockfile',desc='test lock')
main()
l.release()
except LockHeld:
sys.exit(1)
"""
def __init__(self, file_=None, 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.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:
if debug:
print 'leck held finilazing and running lock.release()'
lock.release()
def lock(self):
"""
locking function, if lock is present it
will raise LockHeld exception
"""
lockname = '%s' % (os.getpid())
if self.debug:
print 'running lock'
self.trylock()
self.makelock(lockname, self.pidfile)
return True
def trylock(self):
running_pid = False
if self.debug:
print 'checking for already running process'
try:
with open(self.pidfile, 'r') as f:
try:
running_pid = int(f.readline())
except ValueError:
running_pid = -1
if self.debug:
print ('lock file present running_pid: %s, '
'checking for execution' % (running_pid,))
# Now we check the PID from lock file matches to the current
# process PID
if running_pid:
try:
kill(running_pid, 0)
except OSError, exc:
if exc.errno in (errno.ESRCH, errno.EPERM):
print ("Lock File is there but"
" the program is not running")
print "Removing lock file for the: %s" % running_pid
self.release()
else:
raise
else:
print "You already have an instance of the program running"
print "It is running as process %s" % running_pid
raise LockHeld()
except IOError, e:
if e.errno != 2:
raise
def release(self):
"""releases the pid by removing the pidfile
"""
if self.debug:
print 'trying to release the pidlock'
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:
if self.debug:
print 'removing pidfile failed %s' % e
pass
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)
dir_, file_ = os.path.split(pidfile)
if not os.path.isdir(dir_):
os.makedirs(dir_)
with open(self.pidfile, 'wb') as f:
f.write(lockname)
self.held = True