# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxxx
# Node ID 3798ec84431d7fc964fb29b8400578f58398539e
# Parent 028862ea9c9d4f319aaad81075a3be29e0454dc8
[XEND] Move all of the various log files created by xen to
be under /var/log/xen instead of under /var/log directly. This has
the advantage of cleaning things up a little and also can make it
easier to restrict the permissions needed by xend.
Signed-off-by: Jeremy Katz <katzj@xxxxxxxxxx>
---
docs/man/xend-config.sxp.pod.5 | 2 +-
docs/misc/xend.tex | 4 ++--
docs/src/user.tex | 4 ++--
tools/Makefile | 1 +
tools/examples/xen-hotplug-common.sh | 2 +-
tools/examples/xend-config.sxp | 2 +-
tools/ioemu/patches/qemu-logging | 1 -
tools/ioemu/vl.c | 2 +-
tools/misc/xend | 2 +-
tools/python/xen/util/bugtool.py | 4 ++--
tools/python/xen/xend/XendRoot.py | 2 +-
tools/python/xen/xend/server/params.py | 4 ++--
tools/security/python/xensec_gen/main.py | 2 +-
13 files changed, 16 insertions(+), 16 deletions(-)
diff -r 028862ea9c9d -r 3798ec84431d docs/man/xend-config.sxp.pod.5
--- a/docs/man/xend-config.sxp.pod.5 Mon Aug 28 12:59:07 2006 +0100
+++ b/docs/man/xend-config.sxp.pod.5 Mon Aug 28 13:05:00 2006 +0100
@@ -23,7 +23,7 @@ The following lists the daemon configura
=item I<logfile>
The location of the file to record runtime log messages. Defaults to
-I</var/log/xend.log>.
+I</var/log/xen/xend.log>.
=item I<loglevel>
diff -r 028862ea9c9d -r 3798ec84431d docs/misc/xend.tex
--- a/docs/misc/xend.tex Mon Aug 28 12:59:07 2006 +0100
+++ b/docs/misc/xend.tex Mon Aug 28 13:05:00 2006 +0100
@@ -214,7 +214,7 @@ Configuration scripts ({\it e.g.} for ne
Configuration scripts ({\it e.g.} for network-script) are looked for in {\tt
/etc/xen}
unless their name begins with '/'.
-Xend sends its log output to {\tt /var/log/xend.log}. This is a rotating
logfile,
+Xend sends its log output to {\tt /var/log/xen/xend.log}. This is a rotating
logfile,
and logs are moved onto {\tt xend.log.1} {\it etc.} as they get large. Old
logs may
be deleted.
@@ -411,7 +411,7 @@ allows access to some debugging function
\end{itemize}
When tracing is on xend logs all functions calls and exceptions to
-{\tt /var/log/xend.trace}.
+{\tt /var/log/xen/xend.trace}.
\begin{thebibliography}{99}
diff -r 028862ea9c9d -r 3798ec84431d docs/src/user.tex
--- a/docs/src/user.tex Mon Aug 28 12:59:07 2006 +0100
+++ b/docs/src/user.tex Mon Aug 28 13:05:00 2006 +0100
@@ -973,8 +973,8 @@ using the \texttt{xm} tool.
\subsection{Logging}
-As \xend\ runs, events will be logged to \path{/var/log/xend.log} and
-(less frequently) to \path{/var/log/xend-debug.log}. These, along with
+As \xend\ runs, events will be logged to \path{/var/log/xen/xend.log} and
+(less frequently) to \path{/var/log/xen/xend-debug.log}. These, along with
the standard syslog files, are useful when troubleshooting problems.
\subsection{Configuring \Xend\ }
diff -r 028862ea9c9d -r 3798ec84431d tools/Makefile
--- a/tools/Makefile Mon Aug 28 12:59:07 2006 +0100
+++ b/tools/Makefile Mon Aug 28 13:05:00 2006 +0100
@@ -39,6 +39,7 @@ install: check
done
$(MAKE) ioemuinstall
$(INSTALL_DIR) -p $(DESTDIR)/var/xen/dump
+ $(INSTALL_DIR) -p $(DESTDIR)/var/log/xen
.PHONY: clean
clean: check_clean
diff -r 028862ea9c9d -r 3798ec84431d tools/examples/xen-hotplug-common.sh
--- a/tools/examples/xen-hotplug-common.sh Mon Aug 28 12:59:07 2006 +0100
+++ b/tools/examples/xen-hotplug-common.sh Mon Aug 28 13:05:00 2006 +0100
@@ -21,7 +21,7 @@ dir=$(dirname "$0")
. "$dir/xen-script-common.sh"
. "$dir/locking.sh"
-exec 2>>/var/log/xen-hotplug.log
+exec 2>>/var/log/xen/xen-hotplug.log
export PATH="/sbin:/bin:/usr/bin:/usr/sbin:$PATH"
export LANG="POSIX"
diff -r 028862ea9c9d -r 3798ec84431d tools/examples/xend-config.sxp
--- a/tools/examples/xend-config.sxp Mon Aug 28 12:59:07 2006 +0100
+++ b/tools/examples/xend-config.sxp Mon Aug 28 13:05:00 2006 +0100
@@ -11,7 +11,7 @@
# Commented out entries show the default for that entry, unless otherwise
# specified.
-#(logfile /var/log/xend.log)
+#(logfile /var/log/xen/xend.log)
#(loglevel DEBUG)
#(xend-http-server no)
diff -r 028862ea9c9d -r 3798ec84431d tools/ioemu/patches/qemu-logging
--- a/tools/ioemu/patches/qemu-logging Mon Aug 28 12:59:07 2006 +0100
+++ b/tools/ioemu/patches/qemu-logging Mon Aug 28 13:05:00 2006 +0100
@@ -43,7 +43,7 @@ Index: ioemu/vl.c
/* default mac address of the first network interface */
+ /* init debug */
-+ sprintf(qemu_dm_logfilename, "/var/log/qemu-dm.%d.log", getpid());
++ sprintf(qemu_dm_logfilename, "/var/log/xen/qemu-dm.%d.log", getpid());
+ cpu_set_log_filename(qemu_dm_logfilename);
+ cpu_set_log(0);
+
diff -r 028862ea9c9d -r 3798ec84431d tools/ioemu/vl.c
--- a/tools/ioemu/vl.c Mon Aug 28 12:59:07 2006 +0100
+++ b/tools/ioemu/vl.c Mon Aug 28 13:05:00 2006 +0100
@@ -5924,7 +5924,7 @@ int main(int argc, char **argv)
/* default mac address of the first network interface */
/* init debug */
- sprintf(qemu_dm_logfilename, "/var/log/qemu-dm.%d.log", getpid());
+ sprintf(qemu_dm_logfilename, "/var/log/xen/qemu-dm.%d.log", getpid());
cpu_set_log_filename(qemu_dm_logfilename);
cpu_set_log(0);
diff -r 028862ea9c9d -r 3798ec84431d tools/misc/xend
--- a/tools/misc/xend Mon Aug 28 12:59:07 2006 +0100
+++ b/tools/misc/xend Mon Aug 28 13:05:00 2006 +0100
@@ -86,7 +86,7 @@ def start_xenstored():
XENSTORED_TRACE = os.getenv("XENSTORED_TRACE")
cmd = "xenstored --pid-file /var/run/xenstore.pid"
if XENSTORED_TRACE:
- cmd += " -T /var/log/xenstored-trace.log"
+ cmd += " -T /var/log/xen/xenstored-trace.log"
s,o = commands.getstatusoutput(cmd)
def start_consoled():
diff -r 028862ea9c9d -r 3798ec84431d tools/python/xen/util/bugtool.py
--- a/tools/python/xen/util/bugtool.py Mon Aug 28 12:59:07 2006 +0100
+++ b/tools/python/xen/util/bugtool.py Mon Aug 28 13:05:00 2006 +0100
@@ -43,8 +43,8 @@ TITLE_RE = re.compile(r'<title>(.*)</tit
FILES_TO_SEND = [ '/var/log/' + x for x in
[ 'syslog', 'messages', 'debug',
- 'xend.log', 'xend-debug.log', 'xenstored-trace.log',
- 'xen-hotplug.log' ] ]
+ 'xen/xend.log', 'xen/xend-debug.log',
'xen/xenstored-trace.log',
+ 'xen/xen-hotplug.log' ] ]
#FILES_TO_SEND = [ ]
diff -r 028862ea9c9d -r 3798ec84431d tools/python/xen/xend/XendRoot.py
--- a/tools/python/xen/xend/XendRoot.py Mon Aug 28 12:59:07 2006 +0100
+++ b/tools/python/xen/xend/XendRoot.py Mon Aug 28 13:05:00 2006 +0100
@@ -52,7 +52,7 @@ class XendRoot:
block_script_dir = "/etc/xen/scripts"
"""Default path to the log file. """
- logfile_default = "/var/log/xend.log"
+ logfile_default = "/var/log/xen/xend.log"
"""Default level of information to be logged."""
loglevel_default = 'DEBUG'
diff -r 028862ea9c9d -r 3798ec84431d tools/python/xen/xend/server/params.py
--- a/tools/python/xen/xend/server/params.py Mon Aug 28 12:59:07 2006 +0100
+++ b/tools/python/xen/xend/server/params.py Mon Aug 28 13:05:00 2006 +0100
@@ -39,8 +39,8 @@ def getenv(var, val, conv=None):
# The following parameters could be placed in a configuration file.
XEND_PID_FILE = '/var/run/xend.pid'
-XEND_TRACE_FILE = '/var/log/xend.trace'
-XEND_DEBUG_LOG = '/var/log/xend-debug.log'
+XEND_TRACE_FILE = '/var/log/xen/xend.trace'
+XEND_DEBUG_LOG = '/var/log/xen/xend-debug.log'
XEND_USER = 'root'
XEND_DEBUG = getenv("XEND_DEBUG", 0, conv=int)
XEND_DAEMONIZE = getenv("XEND_DAEMONIZE", not XEND_DEBUG, conv=int)
diff -r 028862ea9c9d -r 3798ec84431d tools/security/python/xensec_gen/main.py
--- a/tools/security/python/xensec_gen/main.py Mon Aug 28 12:59:07 2006 +0100
+++ b/tools/security/python/xensec_gen/main.py Mon Aug 28 13:05:00 2006 +0100
@@ -34,7 +34,7 @@ import CGIHTTPServer
gHttpPort = 7777
gHttpDir = '/var/lib/xensec_gen'
-gLogFile = '/var/log/xensec_gen.log'
+gLogFile = '/var/log/xen/xensec_gen.log'
gUser = 'nobody'
gGroup = 'nobody'
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home