mirror/CumulusNetworks-ifupdown2
1
0
Fork 0
mirror of https://github.com/CumulusNetworks/ifupdown2.git synced 2024-05-06 15:54:50 +00:00
Code

main: re-add lockFile check to avoid concurrent execution

Browse Source 
Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>
This commit is contained in:
Julien Fortin
2020-05-28 22:20:10 +02:00
parent 47090bf6df
commit 4a888991da
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ifupdown2/ifupdown/main.py
View File

@ -16,6 +16,7 @@ import configparser
try:
from ifupdown2.ifupdown.argv import Parse
from ifupdown2.ifupdown.utils import utils
from ifupdown2.ifupdown.config import IFUPDOWN2_CONF_PATH
from ifupdown2.ifupdown.ifupdownmain import ifupdownMain
@ -23,6 +24,7 @@ try:
except (ImportError, ModuleNotFoundError):
from ifupdown.argv import Parse
from ifupdown.utils import utils
from ifupdown.config import IFUPDOWN2_CONF_PATH
from ifupdown.ifupdownmain import ifupdownMain
@ -31,6 +33,7 @@ except (ImportError, ModuleNotFoundError):
log = logging.getLogger()
configmap_g = None
lockfile = "/run/network/.lock"
class Ifupdown2:
@ -64,6 +67,10 @@ class Ifupdown2:
try:
self.read_config()
self.init(stdin_buffer)
if self.op != 'query' and not utils.lockFile(lockfile):
raise Exception("Another instance of this program is already running.")
self.handlers.get(self.op)(self.args)
except Exception as e:
if not str(e):