From: Prashanth Mundkur <prashanth.mundkur@citrix.com>
Date: Wed, 3 Jun 2009 18:57:47 +0000 (-0700)
Subject: Removed rpc-id generator from jsonrpc api; added some exception error printers.
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=fa8817e4737802fef9b68a4d8f52f75f9049425a;p=xenclient%2Ftoolstack.git

Removed rpc-id generator from jsonrpc api; added some exception error printers.
---

diff --git a/libs/jsonrpc/jsonrpc.ml b/libs/jsonrpc/jsonrpc.ml
index cc5d9f0..bfc6215 100644
--- a/libs/jsonrpc/jsonrpc.ml
+++ b/libs/jsonrpc/jsonrpc.ml
@@ -26,11 +26,27 @@ type req_error =
 	| Request_json_conv_error of error
 	| Request_invalid_params
 
+let string_of_req_error = function
+	| Request_json_conv_error e ->
+		Printf.sprintf "jsonrpc type-conversion error in request: %s"
+			(string_of_error e)
+	| Request_invalid_params ->
+		"jsonrpc error: invalid request params"
+
 type resp_error =
 	| Response_json_conv_error of error
 	| Response_no_result_or_error
 	| Response_both_result_and_error
 
+let string_of_resp_error = function
+	| Response_json_conv_error e ->
+		Printf.sprintf "jsonrpc type-conversion error in response: %s"
+			(string_of_error e)
+	| Response_no_result_or_error ->
+		"jsonrpc error: invalid response (no result or error)"
+	| Response_both_result_and_error ->
+		"jsonrpc error: invalid response (both result and error)"
+
 exception Invalid_id of Json.t
 exception Invalid_request of req_error
 exception Invalid_response of resp_error
@@ -130,8 +146,3 @@ let response_to_json resp =
 	| Error e  -> error_to_json resp.response_id e
 
 let response_to_string resp = Json.to_string (response_to_json resp)
-
-module type Rpc_id_generator =
-sig
-	val get_rpc_request_id: unit -> Json.t
-end
diff --git a/libs/jsonrpc/jsonrpc.mli b/libs/jsonrpc/jsonrpc.mli
index bb54c14..d672cff 100644
--- a/libs/jsonrpc/jsonrpc.mli
+++ b/libs/jsonrpc/jsonrpc.mli
@@ -22,11 +22,13 @@ val code_error_internal_error : int
 type req_error =
 	| Request_json_conv_error of Json_conv.error
 	| Request_invalid_params
+val string_of_req_error: req_error -> string
 
 type resp_error =
 	| Response_json_conv_error of Json_conv.error
 	| Response_no_result_or_error
 	| Response_both_result_and_error
+val string_of_resp_error: resp_error -> string
 
 exception Invalid_id of Json.t
 exception Invalid_request of req_error
@@ -65,8 +67,3 @@ val request_of_string: string -> rpc_request
 val request_to_string: rpc_request -> string
 val response_of_string: string -> rpc_response
 val response_to_string: rpc_response -> string
-
-module type Rpc_id_generator =
-sig
-	val get_rpc_request_id : unit -> Json.t
-end