Fix lein module to exit upon exception.

client.ml

@@ -105,8 +105,8 @@ let rec handler (r,w,p) raw resp =
                  handler (r,w,p) raw tl
               | [] -> ()
 
-let eval port ns form =
-  let _ = Nrepl.new_session "127.0.0.1" port [eval_message form ns] handler in
+let eval port messages =
+  let _ = Nrepl.new_session "127.0.0.1" port messages handler in
   never_returns (Scheduler.go ())
 
 (* invoking main functions *)
@@ -140,4 +140,5 @@ let main port args =
   match args with
     | [] -> eprintf "Missing ns argument."; exit 1
     | ns :: args -> let form = main_form ns (splice_args args) in
-                    eval port "user" form
+                    let messages = [eval_message form "user"] in
+                    eval port messages

lein.ml

@@ -18,8 +18,6 @@ let repl_port () =
         | `Yes -> int_of_string (In_channel.read_all filename)
         | `No | `Unknown -> eprintf "%s%!" port_err; exit 1
 
-let ns = "leiningen.core.main"
-
 let form = sprintf "(binding [*cwd* \"%s\", *exit-process?* false]
                       (System/setProperty \"leiningen.original.pwd\" \"%s\")
 
@@ -37,9 +35,17 @@ let form = sprintf "(binding [*cwd* \"%s\", *exit-process?* false]
                             (when-not (and (number? c) (zero? c))
                               (throw e))))))"
 
-let main args =
+let main_message args session =
   let cwd = Sys.getcwd () in
   let root = Client.find_root cwd cwd in
-  let port = repl_port () in
   let form = form root cwd (Client.splice_args args) in
-  Client.eval port "leiningen.core.main" form
+  ([("session", session);
+    ("op", "eval");
+    ("id", "main");
+    ("ns", "leiningen.core.main");
+    ("code", form)],
+   Nrepl.exit_actions)
+
+let main args =
+  let port = repl_port () in
+  Client.eval port [main_message args]

nrepl.ml

@@ -20,6 +20,9 @@ let default_actions =
 let quiet_actions =
   { default_actions with out = do_nothing; }
 
+let exit_actions =
+  { quiet_actions with ex = fun e -> Pervasives.exit 1 }
+
 let print_all =
   { default_actions with value = Printf.printf "%s\n%!"; }