From: Jon Ludlam <jonathan.ludlam@eu.citrix.com>
Date: Fri, 9 Dec 2011 16:31:29 +0000
Subject: log-filenames

---
 ocaml/license/v6testd.ml   |    2 +-
 ocaml/xapi/audit_log.ml    |    6 +++---
 ocaml/xenops/squeezed.ml   |    2 +-
 scripts/audit-logrotate    |    2 +-
 scripts/log.conf           |   10 +++++-----
 scripts/squeezed-logrotate |    2 +-
 scripts/v6d-logrotate      |    2 +-
 scripts/xapi-logrotate     |    2 +-
 8 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/ocaml/license/v6testd.ml b/ocaml/license/v6testd.ml
index 940d505..5d5761d 100644
--- a/ocaml/license/v6testd.ml
+++ b/ocaml/license/v6testd.ml
@@ -15,6 +15,6 @@
 module P = V6rpc.V6process(Fakev6)
 
 let _ =
-	Logs.reset_all [ "file:/var/log/v6d.log" ];
+	Logs.reset_all [ "file:/var/log/xcp-v6d.log" ];
 	V6daemon.startup (fun () -> ()) P.process
 
diff --git a/ocaml/xapi/audit_log.ml b/ocaml/xapi/audit_log.ml
index 483392f..3ae014f 100644
--- a/ocaml/xapi/audit_log.ml
+++ b/ocaml/xapi/audit_log.ml
@@ -18,7 +18,7 @@ open Http
 open Stringext
 open Pervasiveext
 
-let audit_log_whitelist_prefix = "/var/log/audit.log"
+let audit_log_whitelist_prefix = "/var/log/xcp-audit.log"
 
 let line_timestamp_length = 21 (* the timestamp length at the debug line *)
 
@@ -105,11 +105,11 @@ let transfer_all_audit_files fd_out ?filter since =
 		ignore_exn (fun ()->atransfer infix "gz");(* try the compressed file *)
 		ignore_exn (fun ()->atransfer infix "") (* then the uncompressed one *)
 	in
-	(* go through audit.log.n->0 first, ascending order of time *)
+	(* go through xcp-audit.log.n->0 first, ascending order of time *)
 	for i=100 downto 0 do
 		atransfer_try_gz (string_of_int i)
 	done;
-	(* finally transfer /var/log/audit.log (the latest one in time) *)
+	(* finally transfer /var/log/xcp-audit.log (the latest one in time) *)
 	atransfer_try_gz ""
 
 
diff --git a/ocaml/xenops/squeezed.ml b/ocaml/xenops/squeezed.ml
index 6df2f8f..d7e7c96 100644
--- a/ocaml/xenops/squeezed.ml
+++ b/ocaml/xenops/squeezed.ml
@@ -12,7 +12,7 @@
  * GNU Lesser General Public License for more details.
  *)
 let default_pidfile = "/var/run/squeezed.pid" 
-let log_file_path = "file:/var/log/squeezed.log" 
+let log_file_path = "file:/var/log/xcp-squeezed.log" 
 
 open Pervasiveext 
 open Squeezed_rpc
diff --git a/scripts/audit-logrotate b/scripts/audit-logrotate
index 486fe82..e93b6b7 100644
--- a/scripts/audit-logrotate
+++ b/scripts/audit-logrotate
@@ -1,4 +1,4 @@
-/var/log/audit.log {
+/var/log/xcp-audit.log {
     missingok
     sharedscripts
     postrotate
diff --git a/scripts/log.conf b/scripts/log.conf
index 518e3a4..8cf12fe 100644
--- a/scripts/log.conf
+++ b/scripts/log.conf
@@ -29,8 +29,8 @@ info;audit;syslog:local6
 warn;;syslog:xapi
 error;;syslog:xapi
 
-# Also print everything (debug<->error) into xensource.log for easier debugging
-debug;;file:/var/log/xensource.log
-info;;file:/var/log/xensource.log
-warn;;file:/var/log/xensource.log
-error;;file:/var/log/xensource.log
+# Also print everything (debug<->error) into xcp-xapi.log for easier debugging
+debug;;file:/var/log/xcp-xapi.log
+info;;file:/var/log/xcp-xapi.log
+warn;;file:/var/log/xcp-xapi.log
+error;;file:/var/log/xcp-xapi.log
diff --git a/scripts/squeezed-logrotate b/scripts/squeezed-logrotate
index 26fc8ca..35d751e 100644
--- a/scripts/squeezed-logrotate
+++ b/scripts/squeezed-logrotate
@@ -1,4 +1,4 @@
-/var/log/squeezed.log {
+/var/log/xcp-squeezed.log {
     missingok
     notifempty
     size 30k
diff --git a/scripts/v6d-logrotate b/scripts/v6d-logrotate
index 7b0d6ce..3ef679b 100644
--- a/scripts/v6d-logrotate
+++ b/scripts/v6d-logrotate
@@ -1,4 +1,4 @@
-/var/log/v6d.log {
+/var/log/xcp-v6d.log {
     missingok
     notifempty
     size 30k
diff --git a/scripts/xapi-logrotate b/scripts/xapi-logrotate
index b197b97..e6dcd2a 100755
--- a/scripts/xapi-logrotate
+++ b/scripts/xapi-logrotate
@@ -1,4 +1,4 @@
-/var/log/xensource.log {
+/var/log/xcp-xapi.log {
     missingok
 	size 16M
     sharedscripts
--