Mercurial > kallithea
diff rhodecode/lib/pidlock.py @ 4116:ffd45b185016 rhodecode-2.2.5-gpl
Imported some of the GPLv3'd changes from RhodeCode v2.2.5.
This imports changes between changesets 21af6c4eab3d and 6177597791c2 in
RhodeCode's original repository, including only changes to Python files and HTML.
RhodeCode clearly licensed its changes to these files under GPLv3
in their /LICENSE file, which states the following:
The Python code and integrated HTML are licensed under the GPLv3 license.
(See:
https://code.rhodecode.com/rhodecode/files/v2.2.5/LICENSE
or
http://web.archive.org/web/20140512193334/https://code.rhodecode.com/rhodecode/files/f3b123159901f15426d18e3dc395e8369f70ebe0/LICENSE
for an online copy of that LICENSE file)
Conservancy reviewed these changes and confirmed that they can be licensed as
a whole to the Kallithea project under GPLv3-only.
While some of the contents committed herein are clearly licensed
GPLv3-or-later, on the whole we must assume the are GPLv3-only, since the
statement above from RhodeCode indicates that they intend GPLv3-only as their
license, per GPLv3ยง14 and other relevant sections of GPLv3.
| author | Bradley M. Kuhn <bkuhn@sfconservancy.org> |
|---|---|
| date | Wed, 02 Jul 2014 19:03:13 -0400 |
| parents | 29e999f26998 |
| children | 7e5f8c12a3fc |
line wrap: on
line diff
--- a/rhodecode/lib/pidlock.py Wed Jul 02 19:03:10 2014 -0400 +++ b/rhodecode/lib/pidlock.py Wed Jul 02 19:03:13 2014 -0400 @@ -1,9 +1,21 @@ +# -*- 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 sys -import time import errno -from warnings import warn from multiprocessing.util import Finalize from rhodecode.lib.compat import kill @@ -27,9 +39,8 @@ 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') + 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 @@ -37,7 +48,7 @@ #run the lock automatically ! self.lock() self._finalize = Finalize(self, DaemonLock._on_finalize, - args=(self, debug), exitpriority=10) + args=(self, debug), exitpriority=10) @staticmethod def _on_finalize(lock, debug): @@ -63,15 +74,15 @@ if self.debug: print 'checking for already running process' try: - pidfile = open(self.pidfile, "r") - pidfile.seek(0) - running_pid = int(pidfile.readline()) - - pidfile.close() + 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 + 'checking for execution' % (running_pid,)) # Now we check the PID from lock file matches to the current # process PID if running_pid: @@ -128,7 +139,6 @@ dir_, file_ = os.path.split(pidfile) if not os.path.isdir(dir_): os.makedirs(dir_) - pidfile = open(self.pidfile, "wb") - pidfile.write(lockname) - pidfile.close + with open(self.pidfile, 'wb') as f: + f.write(lockname) self.held = True