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

Client: better error message for RPC connection failed

Browse Source 
Also some rewording.
This commit is contained in:
Vincent Bernardoff 2017-12-04 16:37:58 +01:00 committed by Benjamin Canou
parent c7729a07f7
commit e3e59f22be
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib_client_base/client_rpcs.ml
View File

@ -90,7 +90,7 @@ let default_config = {
} }
type rpc_error = type rpc_error =
| Cannot_connect_to_RPC_server of string | Connection_failed of string
| Request_failed of string list * Cohttp.Code.status_code | Request_failed of string list * Cohttp.Code.status_code
| Malformed_json of string list * string * string | Malformed_json of string list * string * string
| Unexpected_json of string list * Data_encoding.json * string | Unexpected_json of string list * Data_encoding.json * string
@ -102,10 +102,10 @@ let rpc_error_encoding =
union union
[ case ~tag: 1 [ case ~tag: 1
(obj2 (obj2
(req "rpc_error_kind" (constant "cannot_connect")) (req "rpc_error_kind" (constant "connection_failed"))
(req "message" string)) (req "message" string))
(function Cannot_connect_to_RPC_server msg -> Some ((), msg) | _ -> None) (function Connection_failed msg -> Some ((), msg) | _ -> None)
(function (), msg -> Cannot_connect_to_RPC_server msg) ; (function (), msg -> Connection_failed msg) ;
case ~tag: 2 case ~tag: 2
(obj3 (obj3
(req "rpc_error_kind" (constant "request_failed")) (req "rpc_error_kind" (constant "request_failed"))
@ -137,8 +137,13 @@ let pp_error ppf (config, err) =
config.host config.port config.host config.port
(String.concat "/" path) in (String.concat "/" path) in
match err with match err with
| Cannot_connect_to_RPC_server msg -> | Connection_failed msg ->
Format.fprintf ppf "Cannot contact RPC server: %s" msg Format.fprintf ppf
"@[<v 2>Unable to connect to the node:@,\
Node's address: %s@,\
Node's RPC port: %d@,\
Error: %s@]"
config.host config.port msg
| Request_failed (path, code) -> | Request_failed (path, code) ->
let code = Cohttp.Code.code_of_status code in let code = Cohttp.Code.code_of_status code in
Format.fprintf ppf "@[<v 2>RPC Request failed:@,\ Format.fprintf ppf "@[<v 2>RPC Request failed:@,\
@ -232,8 +237,10 @@ class rpc config = object (self)
end begin fun exn -> end begin fun exn ->
let msg = match exn with let msg = match exn with
| Unix.Unix_error (e, _, _) -> Unix.error_message e | Unix.Unix_error (e, _, _) -> Unix.error_message e
| Failure msg -> msg
| Invalid_argument msg -> msg
| e -> Printexc.to_string e in | e -> Printexc.to_string e in
fail config (Cannot_connect_to_RPC_server msg) fail config (Connection_failed msg)
end end
method get_streamed_json meth service json = method get_streamed_json meth service json =
@ -334,7 +341,7 @@ let make_request config log_request meth service json =
let msg = match exn with let msg = match exn with
| Unix.Unix_error (e, _, _) -> Unix.error_message e | Unix.Unix_error (e, _, _) -> Unix.error_message e
| e -> Printexc.to_string e in | e -> Printexc.to_string e in
fail config (Cannot_connect_to_RPC_server msg) fail config (Connection_failed msg)
end end
let call_service0 (rpc : #rpc_sig) service arg = let call_service0 (rpc : #rpc_sig) service arg =