YunoHost/moulinette
1
0
Fork 0
mirror of https://github.com/YunoHost/moulinette.git synced 2024-09-03 20:06:31 +02:00
Code Issues Projects Releases Packages Wiki Activity

Forget about the old BYPASS_LOCK thing from actionmap

Browse source
This commit is contained in:
Alexandre Aubin 2017-08-13 16:40:44 -04:00
parent 9006f8980f
commit ab47f30f18
3 changed files with 1 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
moulinette/core.py
View file

@ -430,7 +430,6 @@ class MoulinetteLock(object):
self._lockfile = '/var/run/moulinette_%s.lock' % namespace self._lockfile = '/var/run/moulinette_%s.lock' % namespace
self._stale_checked = False self._stale_checked = False
self._locked = False self._locked = False
self._bypass = False
def acquire(self): def acquire(self):
"""Attempt to acquire the lock for the moulinette instance """Attempt to acquire the lock for the moulinette instance
@ -443,10 +442,6 @@ class MoulinetteLock(object):
start_time = time.time() start_time = time.time()
while True: while True:
if 'BYPASS_LOCK' in os.environ and os.environ['BYPASS_LOCK'] == 'yes':
self._bypass = True
break
lock_pid = self._lock_PID() lock_pid = self._lock_PID()
if lock_pid is None: if lock_pid is None:
@ -477,9 +472,7 @@ class MoulinetteLock(object):
""" """
if self._locked: if self._locked:
if not self._bypass: os.unlink(self._lockfile)
os.unlink(self._lockfile)
logger.debug('lock has been released') logger.debug('lock has been released')
self._locked = False self._locked = False

4
moulinette/interfaces/__init__.py
View file

@ -152,10 +152,6 @@ class BaseActionsMapParser(object):
namespace = argparse.Namespace() namespace = argparse.Namespace()
namespace._tid = tid namespace._tid = tid
# Check lock
if not self.get_conf(tid, 'lock'):
os.environ['BYPASS_LOCK'] = 'yes'
# Perform authentication if needed # Perform authentication if needed
if self.get_conf(tid, 'authenticate'): if self.get_conf(tid, 'authenticate'):
auth_conf, cls = self.get_conf(tid, 'authenticator') auth_conf, cls = self.get_conf(tid, 'authenticator')

3
moulinette/interfaces/api.py
View file

@ -634,9 +634,6 @@ class ActionsMapParser(BaseActionsMapParser):
raise MoulinetteError(errno.EINVAL, m18n.g('error_see_log')) raise MoulinetteError(errno.EINVAL, m18n.g('error_see_log'))
ret = argparse.Namespace() ret = argparse.Namespace()
if not self.get_conf(tid, 'lock'):
os.environ['BYPASS_LOCK'] = 'yes'
# Perform authentication if needed # Perform authentication if needed
if self.get_conf(tid, 'authenticate'): if self.get_conf(tid, 'authenticate'):
# TODO: Clean this hard fix and find a way to set an authenticator # TODO: Clean this hard fix and find a way to set an authenticator