]> xenbits.xensource.com Git - xen.git/commitdiff
oxenstored: Fix process.ml build after 070ab4c50593
authorIan Jackson <ian.jackson@eu.citrix.com>
Mon, 9 Sep 2013 14:30:42 +0000 (15:30 +0100)
committerIan Jackson <Ian.Jackson@eu.citrix.com>
Mon, 9 Sep 2013 16:30:53 +0000 (17:30 +0100)
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 <Ian.Jackson@eu.citrix.com>
Acked-by: David Scott <dave.scott@eu.citrix.com>
tools/ocaml/xenstored/process.ml

index bd87646bc630378a969f7890ca0f2404b5ab826f..5c817552c147a026aa3cd27c7ff6b081e44460b8 100644 (file)
@@ -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