Merge branch 'ipv6'

[nodemanager.git] / account.py

diff --git a/account.py b/account.py
index a069f2c..b2f9714 100644 (file)
--- a/account.py
+++ b/account.py
@@ -150,16 +150,18 @@ 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))
+                if is_mounted (sliver_ssh):
+                    command=['umount',sliver_ssh]
+                    umounted=logger.log_call(command)
+                    msg="OK" if umounted else "WARNING: FAILED"
+                    logger.log("_manage_ssh_dir: umounted %s - %s"%(sliver_ssh,msg))
         except:
-            logger.log_exc("_manage_ssh_dir with slice %s failed"%slicename)
+            logger.log_exc("_manage_ssh_dir failed",name=slicename)
 
 class Worker: