From 5bf83fd0745fac6c48ea127fa271c7e2d62b15b5 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Mon, 9 Sep 2013 15:30:42 +0100 Subject: oxenstored: Fix process.ml build after 070ab4c50593 This change: 070ab4c505934951f86f42dd8403cf62bc5822f0 "oxenstored: Protect oxenstored from malicious domains" broke the build because it had an unresolved semantic (but not textual) conflict with c69fddbd5dfa3004aaf2d0f2dde00c9ec3dd6d5d "tools/ocaml: Remove log library from tools/ocaml/libs" (which is in 4.2 but not 4.1) Fix this by using the 4.1.x idiom in the new error handling introduced in 070ab4c50593. Signed-off-by: Ian Jackson Acked-by: David Scott --- tools/ocaml/xenstored/process.ml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/ocaml/xenstored/process.ml b/tools/ocaml/xenstored/process.ml index bd87646bc6..5c817552c1 100644 --- a/tools/ocaml/xenstored/process.ml +++ b/tools/ocaml/xenstored/process.ml @@ -372,8 +372,8 @@ let do_input store cons doms con = try Connection.do_input con with Failure exp -> - error "caught exception %s" exp; - error "got a bad client %s" (sprintf "%-8s" (Connection.get_domstr con)); + Logs.error "general" "caught exception %s" exp; + Logs.error "general" "got a bad client %s" (sprintf "%-8s" (Connection.get_domstr con)); Connection.mark_as_bad con; false in -- cgit v1.2.3