Remove debug print

[hcoop/domtool2.git] / src / domain.sml

diff --git a/src/domain.sml b/src/domain.sml
index 642f71c..8df5413 100644 (file)
--- a/src/domain.sml
+++ b/src/domain.sml
@@ -667,7 +667,7 @@ val () = Env.registerPost (fn () =>
                                                       handle OS.SysErr _ =>
                                                              ErrorMsg.error NONE ("Delete failed for " ^ dst);
                                                       (site,
-                                                       {action = Slave.Delete,
+                                                       {action = Slave.Delete true,
                                                         domain = dom,
                                                         dir = dir,
                                                         file = dst}))
@@ -715,11 +715,11 @@ val _ = Env.type_one "mail_node"
            orelse (hasPriv "mail"
                    andalso List.exists (fn x => x = node) Config.mailNodes_admin))
 
-fun rmdom doms =
+fun rmdom' delete resultRoot doms =
     let
        fun doNode (node, _) =
            let
-               val dname = OS.Path.joinDirFile {dir = Config.resultRoot,
+               val dname = OS.Path.joinDirFile {dir = resultRoot,
                                                 file = node}
 
                fun doDom (dom, actions) =
@@ -743,18 +743,18 @@ fun rmdom doms =
                                                loop (visitDom (fname ^ "." ^ dom,
                                                                fnameFull,
                                                                actions))
-                                           else                                                        
-                                               loop ({action = Slave.Delete,
-                                                      domain = dom,
-                                                      dir = dname,
-                                                      file = fnameFull} :: actions)
+                                           else                        
+                                                loop ({action = Slave.Delete delete,
+                                                       domain = dom,
+                                                       dir = dname,
+                                                       file = fnameFull} :: actions)
                                        end
                            in
                                loop actions
                                before Posix.FileSys.closedir dir
                            end
-                               handle OS.SysErr _ =>
-                                      (print ("Warning: System error deleting domain " ^ dom ^ " on " ^ node ^ ".\n");
+                               handle OS.SysErr (s, _) =>
+                                      (print ("Warning: System error deleting domain " ^ dom ^ " on " ^ node ^ ": " ^ s ^ "\n");
                                        actions)
                    in
                        visitDom (dom, dname, actions)
@@ -771,11 +771,14 @@ fun rmdom doms =
                fun doDom dom =
                    let
                        val domPath = String.concatWith "/" (rev (String.fields (fn ch => ch = #".") dom))
-                       val dname = OS.Path.joinDirFile {dir = Config.resultRoot,
+                       val dname = OS.Path.joinDirFile {dir = resultRoot,
                                                         file = node}
                        val dname = OS.Path.concat (dname, domPath)
                    in
-                       ignore (OS.Process.system (Config.rm ^ " -rf " ^ dname))
+                       if delete then
+                           ignore (OS.Process.system (Config.rm ^ " -rf " ^ dname))
+                       else
+                           ()
                    end
            in
                app doDom doms
@@ -785,6 +788,9 @@ fun rmdom doms =
        app cleanupNode Config.nodeIps
     end
 
+val rmdom = rmdom' true Config.resultRoot
+val rmdom' = rmdom' false
+
 fun homedirOf uname =
     Posix.SysDB.Passwd.home (Posix.SysDB.getpwnam uname)