Skip to content

Brian's fix #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Brian's fix #22

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
66add4a
workload_balancing.ml: Clean up whitespace before semantic change.
matthiasgoergens Feb 17, 2011
fd59f67
Check error code, instead of assuming failure.
matthiasgoergens Feb 17, 2011
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 18 additions & 24 deletions ocaml/xapi/workload_balancing.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,32 +223,26 @@ let generate_safe_param tag_name tag_value =
Xml.to_string (Xml.Element(tag_name, [], [Xml.PCData tag_value]))

(* if the call has failed we should try and retrieve the result code and any error messages*)
let parse_result_code meth xml_data response initial_error enable_log =
let code =
try
data_from_leaf (descend_and_match ["ResultCode"] xml_data)
with
| Xml_parse_failure error ->
raise_malformed_response' meth
(sprintf "After failing to retrieve valid response, an error code\
let parse_result_code meth xml_data response initial_error enable_log =
let code =
try
data_from_leaf (descend_and_match ["ResultCode"] xml_data)
with | Xml_parse_failure error ->
raise_malformed_response' meth
(sprintf "After failing to retrieve valid response, an error code\
could not be found. Some data is missing or corrupt.
Attempt retrieve valid response: (%s)
Attempt to retrieve error code: (%s)"
initial_error error)
(if enable_log
then
response
else
"Logging output disabled for this call.")
in
let message =
try
data_from_leaf (descend_and_match ["ErrorMessage"] xml_data)
with
| Xml_parse_failure msg -> ""
in
raise_internal_error [code; message]

Attempt to retrieve error code: (%s)"
initial_error error)
(if enable_log
then response
else "Logging output disabled for this call.") in
if (code != 0) then
let message =
try data_from_leaf (descend_and_match ["ErrorMessage"] xml_data)
with | Xml_parse_failure msg -> "" in
raise_internal_error [code; message]

let retrieve_inner_xml meth response enable_log=
try
descend_and_match (path_to_inner meth) response
Expand Down