Use syslog from xcp

Signed-off-by: Jon Ludlam <jonathan.ludlam@eu.citrix.com>

Author: Jon Ludlam

_oasis

@@ -32,7 +32,7 @@ Library xenopsd
   Path:               lib
   Findlibname:        xenopsd
   Modules:            Cancellable_subprocess, Bootloader, Ionice, Mac, Xenops_migrate, Xenops_hooks, Task_server, Xenops_task, Updates, Xenops_utils, Xenops_server, Xenopsd, Xenops_server_plugin, Xenops_server_skeleton, Scheduler, Path, Storage, Interface
-  BuildDepends:       syslog, threads, threads.posix, uuidm, xmlm, cohttp, uri, rpclib, rpclib.syntax, forkexec, fd-send-recv, xcp, xcp.xen, xcp.storage, rpclib.syntax, sexplib, xcp
+  BuildDepends:       threads, threads.posix, uuidm, xmlm, cohttp, uri, rpclib, rpclib.syntax, forkexec, fd-send-recv, xcp, xcp.xen, xcp.storage, rpclib.syntax, sexplib, xcp
 
 Executable xenguest
   CompiledObject:     best

_tags

@@ -1,5 +1,5 @@
 # OASIS_START
-# DO NOT EDIT (digest: 6adfdcd89fb0d753f9b9b283e10815f6)
+# DO NOT EDIT (digest: 5c2e2b7e36393ffd36642a4bdd4bbefa)
 # Ignore VCS directories, you can use the same kind of rule outside 
 # OASIS_START/STOP if you want to exclude directories that contains 
 # useless stuff for the build process
@@ -20,7 +20,6 @@
 <lib/*.ml{,i}>: pkg_xcp
 <lib/*.ml{,i}>: pkg_xcp.storage
 <lib/*.ml{,i}>: pkg_sexplib
-<lib/*.ml{,i}>: pkg_syslog
 <lib/*.ml{,i}>: pkg_threads
 <lib/*.ml{,i}>: pkg_threads.posix
 <lib/*.ml{,i}>: pkg_uuidm
@@ -51,7 +50,6 @@
 <xc/xenops_xc_main.{native,byte}>: pkg_xcp.memory
 <xc/xenops_xc_main.{native,byte}>: pkg_sexplib
 <xc/xenops_xc_main.{native,byte}>: pkg_xcp-inventory
-<xc/xenops_xc_main.{native,byte}>: pkg_syslog
 <xc/xenops_xc_main.{native,byte}>: pkg_threads
 <xc/xenops_xc_main.{native,byte}>: pkg_threads.posix
 <xc/xenops_xc_main.{native,byte}>: pkg_uuidm
@@ -74,7 +72,6 @@
 <xc/*.ml{,i}>: pkg_xcp.memory
 <xc/*.ml{,i}>: pkg_sexplib
 <xc/*.ml{,i}>: pkg_xcp-inventory
-<xc/*.ml{,i}>: pkg_syslog
 <xc/*.ml{,i}>: pkg_threads
 <xc/*.ml{,i}>: pkg_threads.posix
 <xc/*.ml{,i}>: pkg_uuidm
@@ -97,7 +94,6 @@
 "xc/fsync_stubs.c": pkg_xcp.memory
 "xc/fsync_stubs.c": pkg_sexplib
 "xc/fsync_stubs.c": pkg_xcp-inventory
-"xc/fsync_stubs.c": pkg_syslog
 "xc/fsync_stubs.c": pkg_threads
 "xc/fsync_stubs.c": pkg_threads.posix
 "xc/fsync_stubs.c": pkg_uuidm
@@ -120,7 +116,6 @@
 "xc/xenctrlext_stubs.c": pkg_xcp.memory
 "xc/xenctrlext_stubs.c": pkg_sexplib
 "xc/xenctrlext_stubs.c": pkg_xcp-inventory
-"xc/xenctrlext_stubs.c": pkg_syslog
 "xc/xenctrlext_stubs.c": pkg_threads
 "xc/xenctrlext_stubs.c": pkg_threads.posix
 "xc/xenctrlext_stubs.c": pkg_uuidm
@@ -138,7 +133,6 @@
 <simulator/xenops_simulator_main.{native,byte}>: pkg_xcp
 <simulator/xenops_simulator_main.{native,byte}>: pkg_xcp.storage
 <simulator/xenops_simulator_main.{native,byte}>: pkg_sexplib
-<simulator/xenops_simulator_main.{native,byte}>: pkg_syslog
 <simulator/xenops_simulator_main.{native,byte}>: pkg_threads
 <simulator/xenops_simulator_main.{native,byte}>: pkg_threads.posix
 <simulator/xenops_simulator_main.{native,byte}>: pkg_uuidm
@@ -154,7 +148,6 @@
 <simulator/*.ml{,i}>: pkg_xcp
 <simulator/*.ml{,i}>: pkg_xcp.storage
 <simulator/*.ml{,i}>: pkg_sexplib
-<simulator/*.ml{,i}>: pkg_syslog
 <simulator/*.ml{,i}>: pkg_threads
 <simulator/*.ml{,i}>: pkg_threads.posix
 <simulator/*.ml{,i}>: pkg_uuidm
@@ -173,7 +166,6 @@
 <libvirt/xenops_libvirt_main.{native,byte}>: pkg_xcp.storage
 <libvirt/xenops_libvirt_main.{native,byte}>: pkg_sexplib
 <libvirt/xenops_libvirt_main.{native,byte}>: pkg_libvirt
-<libvirt/xenops_libvirt_main.{native,byte}>: pkg_syslog
 <libvirt/xenops_libvirt_main.{native,byte}>: pkg_threads
 <libvirt/xenops_libvirt_main.{native,byte}>: pkg_threads.posix
 <libvirt/xenops_libvirt_main.{native,byte}>: pkg_uuidm
@@ -190,7 +182,6 @@
 <libvirt/*.ml{,i}>: pkg_xcp.storage
 <libvirt/*.ml{,i}>: pkg_sexplib
 <libvirt/*.ml{,i}>: pkg_libvirt
-<libvirt/*.ml{,i}>: pkg_syslog
 <libvirt/*.ml{,i}>: pkg_threads
 <libvirt/*.ml{,i}>: pkg_threads.posix
 <libvirt/*.ml{,i}>: pkg_uuidm
@@ -218,7 +209,6 @@
 <xl/xenops_xl_main.{native,byte}>: pkg_xcp.memory
 <xl/xenops_xl_main.{native,byte}>: pkg_sexplib
 <xl/xenops_xl_main.{native,byte}>: pkg_xcp-inventory
-<xl/xenops_xl_main.{native,byte}>: pkg_syslog
 <xl/xenops_xl_main.{native,byte}>: pkg_threads
 <xl/xenops_xl_main.{native,byte}>: pkg_threads.posix
 <xl/xenops_xl_main.{native,byte}>: pkg_uuidm
@@ -243,7 +233,6 @@
 <xl/*.ml{,i}>: pkg_xcp.memory
 <xl/*.ml{,i}>: pkg_sexplib
 <xl/*.ml{,i}>: pkg_xcp-inventory
-<xl/*.ml{,i}>: pkg_syslog
 <xl/*.ml{,i}>: pkg_threads
 <xl/*.ml{,i}>: pkg_threads.posix
 <xl/*.ml{,i}>: pkg_uuidm
@@ -268,7 +257,6 @@
 "xl/fsync_stubs.c": pkg_xcp.memory
 "xl/fsync_stubs.c": pkg_sexplib
 "xl/fsync_stubs.c": pkg_xcp-inventory
-"xl/fsync_stubs.c": pkg_syslog
 "xl/fsync_stubs.c": pkg_threads
 "xl/fsync_stubs.c": pkg_threads.posix
 "xl/fsync_stubs.c": pkg_uuidm
@@ -293,7 +281,6 @@
 "xl/poll_stubs.c": pkg_xcp.memory
 "xl/poll_stubs.c": pkg_sexplib
 "xl/poll_stubs.c": pkg_xcp-inventory
-"xl/poll_stubs.c": pkg_syslog
 "xl/poll_stubs.c": pkg_threads
 "xl/poll_stubs.c": pkg_threads.posix
 "xl/poll_stubs.c": pkg_uuidm

lib/META

@@ -1,9 +1,9 @@
 # OASIS_START
-# DO NOT EDIT (digest: fe20234855dd68aa5129735f8475dde3)
+# DO NOT EDIT (digest: 05497db94fb93ddb7a6ea84dc7232c63)
 version = "0.9.24"
 description = "XenServer domain managers"
 requires =
-"syslog threads threads.posix uuidm xmlm cohttp uri rpclib rpclib.syntax forkexec fd-send-recv xcp xcp.xen xcp.storage rpclib.syntax sexplib xcp"
+"threads threads.posix uuidm xmlm cohttp uri rpclib rpclib.syntax forkexec fd-send-recv xcp xcp.xen xcp.storage rpclib.syntax sexplib xcp"
 archive(byte) = "xenopsd.cma"
 archive(byte, plugin) = "xenopsd.cma"
 archive(native) = "xenopsd.cmxa"

lib/xenops_utils.ml

@@ -16,54 +16,6 @@ open Xenops_interface
 
 let ( |> ) a b = b a
 
-module type BRAND = sig val name: string end
-
-module Debug = struct
-	type level =
-	| Debug
-	| Warn
-	| Info
-	| Error
-
-	let disabled_modules = ref []
-	let disable m =
-		disabled_modules := m :: !disabled_modules
-
-	let stderr key level x =
-		output_string stderr (Printf.sprintf "[%s|%s] %s" key (match level with
-		| Debug -> "debug"
-		| Warn -> "warn"
-		| Info -> "info"
-		| Error -> "error") x);
-		output_string stderr "\n";
-		flush stderr
-
-	let syslog ?(facility=`LOG_LOCAL5) name () =
-		let t = Syslog.openlog ~facility name in
-		fun key level x ->
-			Syslog.syslog t (match level with
-			| Debug -> `LOG_DEBUG
-			| Warn -> `LOG_WARNING
-			| Info -> `LOG_INFO
-			| Error -> `LOG_ERR
-			) (Printf.sprintf "[%s] %s" key x)
-
-	let output = ref stderr
-
-	let write key level x =
-		if not(List.mem key !disabled_modules)
-		then !output key level x
-
-	let with_thread_associated _ f x = f x (* XXX *)
-
-	module Make = functor(Brand: BRAND) -> struct
-		let debug fmt = Printf.ksprintf (write Brand.name Debug) fmt
-		let error fmt = Printf.ksprintf (write Brand.name Error) fmt
-		let info fmt = Printf.ksprintf (write Brand.name Info) fmt
-		let warn fmt = Printf.ksprintf (write Brand.name Warn) fmt
-	end
-end
-
 module D = Debug.Make(struct let name = "xenops_utils" end)
 open D
 

lib/xenopsd.ml

@@ -88,8 +88,6 @@ let handle_received_fd this_connection =
 
 
 let main ?(specific_options=[]) ?(specific_essential_paths=[]) ?(specific_nonessential_paths=[]) backend =
-	Debug.output := Debug.syslog (Filename.basename Sys.argv.(0)) ();
-
 	debug "xenopsd version %d.%d starting" major_version minor_version;
 
 	let options = options @ specific_options in

setup.ml

@@ -1,7 +1,7 @@
 (* setup.ml generated for the first time by OASIS v0.3.0 *)
 
 (* OASIS_START *)
-(* DO NOT EDIT (digest: 4050686096419fab4143c6d367c5ef1f) *)
+(* DO NOT EDIT (digest: e37be906ef3d0135a19b8a37000afdb1) *)
 (*
    Regenerated by OASIS v0.3.0
    Visit http://oasis.forge.ocamlcore.org for more information and
@@ -5697,7 +5697,6 @@ let setup_t =
                       bs_compiled_object = Best;
                       bs_build_depends =
                         [
-                           FindlibPackage ("syslog", None);
                            FindlibPackage ("threads", None);
                            FindlibPackage ("threads.posix", None);
                            FindlibPackage ("uuidm", None);
@@ -5949,14 +5948,14 @@ let setup_t =
           };
      oasis_fn = Some "_oasis";
      oasis_version = "0.3.0";
-     oasis_digest = Some "Z\160\249\140\016C>D\224\241\213p&\160PV";
+     oasis_digest = Some "\0014-a\191\218\156\157\1298\140^\140\251\030\222";
      oasis_exec = None;
      oasis_setup_args = [];
      setup_update = false;
      };;
 
 let setup () = BaseSetup.setup setup_t;;
 
-# 5961 "setup.ml"
+# 5960 "setup.ml"
 (* OASIS_STOP *)
 let () = setup ();;