# HG changeset patch
# User Marcus Granado <marcus.granado@xxxxxxxxxx>
# Date 1259342565 0
# Node ID c6b0c4714557c0271beea33448524e04854409ca
# Parent  2418f4aa9cd0cb6558beac1ab35a1453991e7f2e
CP-706: add syslog facility option to xapi log.conf

Signed-off-by: Marcus Granado <marcus.granado@xxxxxxxxxxxxx>

diff -r 2418f4aa9cd0 -r c6b0c4714557 log/log.ml
--- a/log/log.ml	Fri Nov 27 15:02:38 2009 +0000
+++ b/log/log.ml	Fri Nov 27 17:22:45 2009 +0000
@@ -228,7 +228,7 @@
 let filesize = ref 0 
 let mutex = Mutex.create ()
 
-let output_common t ?(raw=false) ?(key="") ?(extra="") priority (message: string) =
+let output_common t ?(raw=false) ?(syslog_time=false) ?(key="") ?(extra="") priority (message: string) =
   let result_string = ref "" in
   let construct_string withtime =
 		(*let key = if key = "" then [] else [ key ] in
@@ -264,7 +264,8 @@
 		| Info  -> Syslog.Info
 		| Warn  -> Syslog.Warning
 		| Error -> Syslog.Err in
-		Syslog.log Syslog.Daemon sys_prio ((construct_string false) ^ "\n")
+		let facility = try Syslog.facility_of_string k with _->Syslog.Daemon in
+		Syslog.log facility sys_prio ((construct_string syslog_time) ^ "\n")
 	| Stream s -> Mutex.execute s.mutex 
 	    (fun () -> 
 	      match !(s.channel) with
@@ -278,8 +279,8 @@
 let output t ?(key="") ?(extra="") priority (message: string) =
 	ignore(output_common t ~key ~extra priority message)
 
-let output_and_return t ?(raw=false) ?(key="") ?(extra="") priority (message: string) =
-	output_common t ~raw ~key ~extra priority message
+let output_and_return t ?(raw=false) ~syslog_time ?(key="") ?(extra="") priority (message: string) =
+	output_common t ~raw ~syslog_time ~key ~extra priority message
 
 let log t level (fmt: ('a, unit, string, unit) format4): 'a =
 	let b = (int_of_level t.level) <= (int_of_level level) in
diff -r 2418f4aa9cd0 -r c6b0c4714557 log/log.mli
--- a/log/log.mli	Fri Nov 27 15:02:38 2009 +0000
+++ b/log/log.mli	Fri Nov 27 17:22:45 2009 +0000
@@ -61,7 +61,7 @@
 (** {2 Raw output functions} *)
 
 val output : t -> ?key:string -> ?extra:string -> level -> string -> unit
-val output_and_return : t -> ?raw:bool -> ?key:string -> ?extra:string -> level -> string -> string
+val output_and_return : t -> ?raw:bool -> syslog_time:bool -> ?key:string -> ?extra:string -> level -> string -> string
 
 (** {2 Pretty output functions} *)
 
diff -r 2418f4aa9cd0 -r c6b0c4714557 log/logs.ml
--- a/log/logs.ml	Fri Nov 27 15:02:38 2009 +0000
+++ b/log/logs.ml	Fri Nov 27 17:22:45 2009 +0000
@@ -189,12 +189,12 @@
       List.iter (fun t -> Log.output t ~key ~extra level s) l) fmt
 		)
 
-let log_and_return key level ?(raw=false) ?(extra="") (fmt: ('a, unit, string, string) format4): 'a =
+let log_and_return key level ?(raw=false) ~syslog_time ?(extra="") (fmt: ('a, unit, string, string) format4): 'a =
 	log_common key level ~extra ~ret_fn1:(fun s->s) fmt
     ~ret_fn2:(fun l ->
 		let ret_str = ref "" in
     Printf.kprintf (fun s ->
-      List.iter (fun t -> ret_str := Log.output_and_return t ~raw ~key ~extra level s) l; !ret_str) fmt
+      List.iter (fun t -> ret_str := Log.output_and_return t ~raw ~syslog_time ~key ~extra level s) l; !ret_str) fmt
 		)
 
 
@@ -208,4 +208,4 @@
 let error t ?extra (fmt: ('a , unit, string, unit) format4) =
 	log t Log.Error ?extra fmt
 let audit t ?raw ?extra (fmt: ('a , unit, string, string) format4) =
-  log_and_return t Log.Info ?raw ?extra fmt
+  log_and_return t Log.Info ?raw ~syslog_time:true ?extra fmt
diff -r 2418f4aa9cd0 -r c6b0c4714557 log/logs.mli
--- a/log/logs.mli	Fri Nov 27 15:02:38 2009 +0000
+++ b/log/logs.mli	Fri Nov 27 17:22:45 2009 +0000
@@ -33,7 +33,7 @@
 val log_and_return :
   string ->
   Log.level ->
-  ?raw:bool -> ?extra:string -> ('a, unit, string, string) format4 -> 'a
+  ?raw:bool -> syslog_time:bool -> ?extra:string -> ('a, unit, string, string) format4 -> 'a
 val debug : string -> ?extra:string -> ('a, unit, string, unit) format4 -> 'a
 val info : string -> ?extra:string -> ('a, unit, string, unit) format4 -> 'a
 val warn : string -> ?extra:string -> ('a, unit, string, unit) format4 -> 'a
diff -r 2418f4aa9cd0 -r c6b0c4714557 log/syslog.ml
--- a/log/syslog.ml	Fri Nov 27 15:02:38 2009 +0000
+++ b/log/syslog.ml	Fri Nov 27 17:22:45 2009 +0000
@@ -22,3 +22,28 @@
 (* external init : string -> options list -> facility -> unit = "stub_openlog" *)
 external log : facility -> level -> string -> unit = "stub_syslog"
 external close : unit -> unit = "stub_closelog"
+
+exception Unknown_facility of string
+let facility_of_string s =
+	match s with
+    |"auth"->Auth
+    |"authpriv"->Authpriv
+    |"cron"->Cron
+    |"daemon"->Daemon
+    |"ftp"->Ftp
+    |"kern"->Kern
+    |"local0"->Local0
+    |"local1"->Local1
+    |"local2"->Local2
+    |"local3"->Local3
+    |"local4"->Local4
+    |"local5"->Local5
+    |"local6"->Local6
+    |"local7"->Local7
+    |"lpr"->Lpr
+    |"mail"->Mail
+    |"news"->News
+    |"syslog"->Syslog
+    |"user"->User
+    |"uucp"->Uucp
+		|_-> raise (Unknown_facility s)
diff -r 2418f4aa9cd0 -r c6b0c4714557 log/syslog.mli
--- a/log/syslog.mli	Fri Nov 27 15:02:38 2009 +0000
+++ b/log/syslog.mli	Fri Nov 27 17:22:45 2009 +0000
@@ -39,3 +39,4 @@
 external close : unit -> unit = "stub_closelog"
 
 
+val facility_of_string : string -> facility