add xenvm unique identifier (vm's uuid) in log when using syslog

diff --git a/common/debug.ml b/common/debug.ml
index 286cddd4247640864f80d491f5fa9f8264a058ba..3d2b23b3d5b34b6e3fdc1085bb862fdbc1ad7c0f 100644 (file)
--- a/common/debug.ml
+++ b/common/debug.ml
@@ -18,9 +18,15 @@ module type BRAND = sig
   val name: string
 end
 
+let uid = ref None
+
 module Debugger = functor(Brand: BRAND) -> struct
   let output (f:string -> ?extra:string -> ('a, unit, string, unit) format4 -> 'a) fmt =
-    let extra = Brand.name in
+    let extra =
+      match !uid with
+      | None -> Brand.name
+      | Some uid -> Printf.sprintf "%s|%s" uid Brand.name
+      in
     f Brand.name ~extra fmt
 
   let debug fmt = output Logs.debug fmt

diff --git a/xenvm/xenvm.ml b/xenvm/xenvm.ml
index 6ea4473aceac80586221a3739fea2241d6169f6f..bc2aea8d24b116c96204326fa91abd41167d826a 100644 (file)
--- a/xenvm/xenvm.ml
+++ b/xenvm/xenvm.ml
@@ -991,6 +991,10 @@ let () =
                                | Some dbg -> dbg
                        )
                        in
+               (* register a unique id if we are using syslog *)
+               if String.startswith "syslog:" a then
+                       Debug.uid := Some uuid;
+
                Logs.set_default Log.Debug [ a ];
                Logs.set_default Log.Info [ a ];
                Logs.set_default Log.Warn [ a ];