Remove catchAllAlias in favor of defaultAlias; add better handling of slave servers...

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

diff --git a/src/main.sml b/src/main.sml
index fd4ff63..87f2869 100644 (file)
--- a/src/main.sml
+++ b/src/main.sml
@@ -836,7 +836,8 @@ fun regenerate context =
                          | _ => print ("Slave " ^ node
                                        ^ " returned unexpected command\n");
                    OpenSSL.close bio
-               end             
+               end
+                handle OpenSSL.OpenSSL s => print ("OpenSSL error: " ^ s ^ "\n")
 
        fun doUser user =
            let
@@ -943,8 +944,10 @@ fun service () =
                              print "\n";
                              Msg.send (bio, MsgOk)))
                         handle e as (OpenSSL.OpenSSL s) =>
-                               (print "OpenSSL error\n";
-                                app (fn x => print (x ^ "\n")) (SMLofNJ.exnHistory e))
+                               (print ("OpenSSL error: " ^ s ^ "\n");
+                                app (fn x => print (x ^ "\n")) (SMLofNJ.exnHistory e);
+                                Msg.send (bio, MsgError ("OpenSSL error: " ^ s))
+                                handle OpenSSL.OpenSSL _ => ())
                              | OS.SysErr (s, _) =>
                                (print "System error: ";
                                 print s;