From: Thierry Parmentelat Date: Fri, 23 May 2014 14:34:44 +0000 (+0200) Subject: use logger.log_call to run mount/umount X-Git-Tag: nodemanager-5.2-14~11 X-Git-Url: http://git.onelab.eu/?p=nodemanager.git;a=commitdiff_plain;h=385b6b2088b9e9413e3b85f46adb18d4a38eebbb use logger.log_call to run mount/umount --- diff --git a/account.py b/account.py index 6030ebe..ca5f2f4 100644 --- a/account.py +++ b/account.py @@ -150,14 +150,16 @@ class Account: if not os.path.isdir (path): raise Exception if not is_mounted(root_ssh): - # xxx perform mount - subprocess.call("mount --bind -o ro %s %s"%(root_ssh,sliver_ssh),shell=True) - logger.log("_manage_ssh_dir: mounted %s into slice %s"%(root_ssh,slicename)) + command=['mount','--bind','-o','ro',root_ssh,sliver_ssh] + mounted=logger.log_call (command) + msg="OK" if mounted else "WARNING: FAILED" + logger.log("_manage_ssh_dir: mounted %s into slice %s - %s"%(root_ssh,slicename,msg)) else: if is_mounted (root_ssh): - # xxx perform umount - subprocess.call("umount %s"%(root_ssh),shell=True) - logger.log("_manage_ssh_dir: umounted %s"%(root_ssh)) + command=['umount',root_ssh] + umounted=logger.log_call(command) + msg="OK" if unmounted else "WARNING: FAILED" + logger.log("_manage_ssh_dir: umounted %s - %s"%(root_ssh,msg)) except: logger.log_exc("_manage_ssh_dir failed",name=slicename)