init.d script for domtool-slave

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

diff --git a/src/main.sml b/src/main.sml
index cb39416..29d2b37 100644 (file)
--- a/src/main.sml
+++ b/src/main.sml
@@ -167,6 +167,9 @@ fun eval' fname =
 val dispatcher =
     Config.dispatcher ^ ":" ^ Int.toString Config.dispatcherPort
 
+val self =
+    "localhost:" ^ Int.toString Config.slavePort
+
 fun requestContext f =
     let
        val uid = Posix.ProcEnv.getuid ()
@@ -191,6 +194,13 @@ fun requestBio f =
        (user, OpenSSL.connect (context, dispatcher))
     end
 
+fun requestSlaveBio () =
+    let
+       val (user, context) = requestContext (fn () => ())
+    in
+       (user, OpenSSL.connect (context, self))
+    end
+
 fun request fname =
     let
        val (user, bio) = requestBio (fn () => ignore (check fname))
@@ -299,6 +309,30 @@ fun requestShutdown () =
        OpenSSL.close bio
     end
 
+fun requestSlavePing () =
+    let
+       val (_, bio) = requestSlaveBio ()
+    in
+       OpenSSL.close bio;
+       OS.Process.success
+    end
+    handle _ => OS.Process.failure
+
+fun requestSlaveShutdown () =
+    let
+       val (_, bio) = requestSlaveBio ()
+    in
+       Msg.send (bio, MsgShutdown);
+       case Msg.recv bio of
+           NONE => print "Server closed connection unexpectedly.\n"
+         | SOME m =>
+           case m of
+               MsgOk => print "Shutdown begun.\n"
+             | MsgError s => print ("Shutdown failed: " ^ s ^ "\n")
+             | _ => print "Unexpected server reply.\n";
+       OpenSSL.close bio
+    end
+
 fun requestGrant acl =
     let
        val (user, bio) = requestBio (fn () => ())
@@ -650,6 +684,8 @@ fun rmuser user =
        Domain.rmdom doms
     end
 
+fun now () = Date.toString (Date.fromTimeUniv (Time.now ()))
+
 fun service () =
     let
        val () = Acl.read Config.aclFile
@@ -667,7 +703,7 @@ fun service () =
              | SOME bio =>
                let
                    val user = OpenSSL.peerCN bio
-                   val () = print ("\nConnection from " ^ user ^ " at " ^ Date.toString (Date.fromTimeUniv (Time.now ())) ^ "\n")
+                   val () = print ("\nConnection from " ^ user ^ " at " ^ now () ^ "\n")
                    val () = Domain.setUser user
 
                    fun doIt f cleanup =
@@ -756,7 +792,7 @@ fun service () =
                              | MsgShutdown =>
                                if Acl.query {user = user, class = "priv", value = "all"}
                                   orelse Acl.query {user = user, class = "priv", value = "shutdown"} then
-                                   print ("Domtool dispatcher shutting down at " ^ Date.toString (Date.fromTimeUniv (Time.now ())) ^ "\n\n")
+                                   print ("Domtool dispatcher shutting down at " ^ now () ^ "\n\n")
                                else
                                    (print "Unauthorized shutdown command!\n";
                                     OpenSSL.close bio
@@ -1011,7 +1047,7 @@ fun service () =
                            handle OpenSSL.OpenSSL _ => ();
                            loop ())
     in
-       print ("Domtool dispatcher starting up at " ^ Date.toString (Date.fromTimeUniv (Time.now ())) ^ "\n");
+       print ("Domtool dispatcher starting up at " ^ now () ^ "\n");
        print "Listening for connections....\n";
        loop ();
        OpenSSL.shutdown sock
@@ -1027,19 +1063,17 @@ fun slave () =
 
        val sock = OpenSSL.listen (context, Config.slavePort)
 
+       val _ = print ("Slave server starting at " ^ now () ^ "\n")
+
        fun loop () =
            case OpenSSL.accept sock of
                NONE => ()
              | SOME bio =>
                let
                    val peer = OpenSSL.peerCN bio
-                   val () = print ("\nConnection from " ^ peer ^ "\n")
+                   val () = print ("\nConnection from " ^ peer ^ " at " ^ now () ^ "\n")
                in
-                   if peer <> Config.dispatcherName then
-                       (print "Not authorized!\n";
-                        OpenSSL.close bio;
-                        loop ())
-                   else let
+                   if peer = Config.dispatcherName then let
                            fun loop' files =
                                case Msg.recv bio of
                                    NONE => print "Dispatcher closed connection unexpectedly\n"
@@ -1058,6 +1092,16 @@ fun slave () =
                            OpenSSL.close bio;
                            loop ()
                        end
+                   else if peer = "domtool" then
+                       case Msg.recv bio of
+                           SOME MsgShutdown => (OpenSSL.close bio;
+                                                print ("Shutting down at " ^ now () ^ "\n\n"))
+                         | _ => (OpenSSL.close bio;
+                                 loop ())
+                   else
+                       (print "Not authorized!\n";
+                        OpenSSL.close bio;
+                        loop ())
                end handle OpenSSL.OpenSSL s =>
                           (print ("OpenSSL error: "^ s ^ "\n");
                            OpenSSL.close bio