balsoft/ligo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

RPC server: use ~on_exn

Browse Source
This commit is contained in:
Vincent Bernardoff 2017-02-27 15:17:24 +01:00 committed by Grégoire Henry
parent ab4015b189
commit 556c965af7
2 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/node/net/RPC_server.ml
View File

@ -183,23 +183,21 @@ let launch ?pre_hook ?post_hook ?(host="::") mode root cors_allowed_origins cors
Conduit_lwt_unix.init ~src:host () >>= fun ctx -> Conduit_lwt_unix.init ~src:host () >>= fun ctx ->
let ctx = Cohttp_lwt_unix_net.init ~ctx () in let ctx = Cohttp_lwt_unix_net.init ~ctx () in
let stop = cancelation () in let stop = cancelation () in
Lwt.async let on_exn = function
(fun () -> | Unix.Unix_error (Unix.EADDRINUSE, "bind", _) ->
Lwt.catch log_error "RPC server port already taken, \
(fun () -> the node will be shutdown" ;
Server.create Lwt_exit.exit 1
~stop ~ctx ~mode | Unix.Unix_error (ECONNRESET, _, _)
(Server.make ~callback ~conn_closed ())) | Unix.Unix_error (EPIPE, _, _) -> ()
(function | exn -> !Lwt.async_exception_hook exn
| Unix.Unix_error (Unix.EADDRINUSE, "bind", _) -> in
lwt_log_error "RPC server port already taken, \ let server =
the node will be shutdown" >>= fun () -> Server.create ~stop ~ctx ~mode ~on_exn
Lwt_exit.exit 1 (Server.make ~callback ~conn_closed ()) in
| exn -> Lwt.fail exn)) ;
let shutdown () = let shutdown () =
canceler () >>= fun () -> canceler () >>= fun () ->
lwt_log_info "server not really stopped (cohttp bug)" >>= fun () -> server in
Lwt.return () (* server *) (* FIXME: bug in cohttp *) in
Lwt.return { shutdown ; root } Lwt.return { shutdown ; root }
let root_service { root } = root let root_service { root } = root

5
src/utils/lwt_exit.ml
View File

@ -16,11 +16,6 @@ let () =
Lwt.async_exception_hook := Lwt.async_exception_hook :=
(function (function
| Exit -> () | Exit -> ()
(* BEGIN HACK
ignore error unhandled by cohttp (until PR129 is merged) *)
| Unix.Unix_error(Unix.ECONNRESET, _, _)
| Unix.Unix_error(Unix.EPIPE, _, _) -> ()
(* END HACK *)
| exn -> | exn ->
Format.eprintf Format.eprintf
"@[Uncaught (asynchronous) exception (%d):@ %a@]" "@[Uncaught (asynchronous) exception (%d):@ %a@]"