direct-io.hg

changeset 11266:3798ec84431d

[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@redhat.com>
author kaf24@localhost.localdomain
date Mon Aug 28 13:05:00 2006 +0100 (2006-08-28)
parents 028862ea9c9d
children 68a1b61ecd28
files docs/man/xend-config.sxp.pod.5 docs/misc/xend.tex docs/src/user.tex tools/Makefile tools/examples/xen-hotplug-common.sh tools/examples/xend-config.sxp tools/ioemu/patches/qemu-logging tools/ioemu/vl.c tools/misc/xend tools/python/xen/util/bugtool.py tools/python/xen/xend/XendRoot.py tools/python/xen/xend/server/params.py tools/security/python/xensec_gen/main.py
line diff
     1.1 --- a/docs/man/xend-config.sxp.pod.5	Mon Aug 28 12:59:07 2006 +0100
     1.2 +++ b/docs/man/xend-config.sxp.pod.5	Mon Aug 28 13:05:00 2006 +0100
     1.3 @@ -23,7 +23,7 @@ The following lists the daemon configura
     1.4  =item I<logfile>
     1.5  
     1.6  The location of the file to record runtime log messages.  Defaults to
     1.7 -I</var/log/xend.log>.
     1.8 +I</var/log/xen/xend.log>.
     1.9  
    1.10  =item I<loglevel>
    1.11  
     2.1 --- a/docs/misc/xend.tex	Mon Aug 28 12:59:07 2006 +0100
     2.2 +++ b/docs/misc/xend.tex	Mon Aug 28 13:05:00 2006 +0100
     2.3 @@ -214,7 +214,7 @@ a sequence of s-expressions. The configu
     2.4  Configuration scripts ({\it e.g.} for network-script) are looked for in {\tt /etc/xen}
     2.5  unless their name begins with '/'.
     2.6  
     2.7 -Xend sends its log output to {\tt /var/log/xend.log}. This is a rotating logfile,
     2.8 +Xend sends its log output to {\tt /var/log/xen/xend.log}. This is a rotating logfile,
     2.9  and logs are moved onto {\tt xend.log.1} {\it etc.} as they get large. Old logs may
    2.10  be deleted.
    2.11  
    2.12 @@ -411,7 +411,7 @@ allows access to some debugging function
    2.13  \end{itemize}
    2.14  
    2.15  When tracing is on xend logs all functions calls and exceptions to
    2.16 -{\tt /var/log/xend.trace}.
    2.17 +{\tt /var/log/xen/xend.trace}.
    2.18  
    2.19  \begin{thebibliography}{99}
    2.20  
     3.1 --- a/docs/src/user.tex	Mon Aug 28 12:59:07 2006 +0100
     3.2 +++ b/docs/src/user.tex	Mon Aug 28 13:05:00 2006 +0100
     3.3 @@ -973,8 +973,8 @@ using the \texttt{xm} tool.
     3.4  
     3.5  \subsection{Logging}
     3.6  
     3.7 -As \xend\ runs, events will be logged to \path{/var/log/xend.log} and
     3.8 -(less frequently) to \path{/var/log/xend-debug.log}. These, along with
     3.9 +As \xend\ runs, events will be logged to \path{/var/log/xen/xend.log} and
    3.10 +(less frequently) to \path{/var/log/xen/xend-debug.log}. These, along with
    3.11  the standard syslog files, are useful when troubleshooting problems.
    3.12  
    3.13  \subsection{Configuring \Xend\ }
     4.1 --- a/tools/Makefile	Mon Aug 28 12:59:07 2006 +0100
     4.2 +++ b/tools/Makefile	Mon Aug 28 13:05:00 2006 +0100
     4.3 @@ -39,6 +39,7 @@ install: check
     4.4  	done
     4.5  	$(MAKE) ioemuinstall
     4.6  	$(INSTALL_DIR) -p $(DESTDIR)/var/xen/dump
     4.7 +	$(INSTALL_DIR) -p $(DESTDIR)/var/log/xen
     4.8  
     4.9  .PHONY: clean
    4.10  clean: check_clean
     5.1 --- a/tools/examples/xen-hotplug-common.sh	Mon Aug 28 12:59:07 2006 +0100
     5.2 +++ b/tools/examples/xen-hotplug-common.sh	Mon Aug 28 13:05:00 2006 +0100
     5.3 @@ -21,7 +21,7 @@ dir=$(dirname "$0")
     5.4  . "$dir/xen-script-common.sh"
     5.5  . "$dir/locking.sh"
     5.6  
     5.7 -exec 2>>/var/log/xen-hotplug.log
     5.8 +exec 2>>/var/log/xen/xen-hotplug.log
     5.9  
    5.10  export PATH="/sbin:/bin:/usr/bin:/usr/sbin:$PATH"
    5.11  export LANG="POSIX"
     6.1 --- a/tools/examples/xend-config.sxp	Mon Aug 28 12:59:07 2006 +0100
     6.2 +++ b/tools/examples/xend-config.sxp	Mon Aug 28 13:05:00 2006 +0100
     6.3 @@ -11,7 +11,7 @@
     6.4  # Commented out entries show the default for that entry, unless otherwise
     6.5  # specified.
     6.6  
     6.7 -#(logfile /var/log/xend.log)
     6.8 +#(logfile /var/log/xen/xend.log)
     6.9  #(loglevel DEBUG)
    6.10  
    6.11  #(xend-http-server no)
     7.1 --- a/tools/ioemu/patches/qemu-logging	Mon Aug 28 12:59:07 2006 +0100
     7.2 +++ b/tools/ioemu/patches/qemu-logging	Mon Aug 28 13:05:00 2006 +0100
     7.3 @@ -43,7 +43,7 @@ Index: ioemu/vl.c
     7.4       /* default mac address of the first network interface */
     7.5       
     7.6  +    /* init debug */
     7.7 -+    sprintf(qemu_dm_logfilename, "/var/log/qemu-dm.%d.log", getpid());
     7.8 ++    sprintf(qemu_dm_logfilename, "/var/log/xen/qemu-dm.%d.log", getpid());
     7.9  +    cpu_set_log_filename(qemu_dm_logfilename);
    7.10  +    cpu_set_log(0);
    7.11  +    
     8.1 --- a/tools/ioemu/vl.c	Mon Aug 28 12:59:07 2006 +0100
     8.2 +++ b/tools/ioemu/vl.c	Mon Aug 28 13:05:00 2006 +0100
     8.3 @@ -5924,7 +5924,7 @@ int main(int argc, char **argv)
     8.4      /* default mac address of the first network interface */
     8.5      
     8.6      /* init debug */
     8.7 -    sprintf(qemu_dm_logfilename, "/var/log/qemu-dm.%d.log", getpid());
     8.8 +    sprintf(qemu_dm_logfilename, "/var/log/xen/qemu-dm.%d.log", getpid());
     8.9      cpu_set_log_filename(qemu_dm_logfilename);
    8.10      cpu_set_log(0);
    8.11      
     9.1 --- a/tools/misc/xend	Mon Aug 28 12:59:07 2006 +0100
     9.2 +++ b/tools/misc/xend	Mon Aug 28 13:05:00 2006 +0100
     9.3 @@ -86,7 +86,7 @@ def start_xenstored():
     9.4      XENSTORED_TRACE = os.getenv("XENSTORED_TRACE")
     9.5      cmd = "xenstored --pid-file /var/run/xenstore.pid"
     9.6      if XENSTORED_TRACE:
     9.7 -        cmd += " -T /var/log/xenstored-trace.log"
     9.8 +        cmd += " -T /var/log/xen/xenstored-trace.log"
     9.9      s,o = commands.getstatusoutput(cmd)
    9.10  
    9.11  def start_consoled():
    10.1 --- a/tools/python/xen/util/bugtool.py	Mon Aug 28 12:59:07 2006 +0100
    10.2 +++ b/tools/python/xen/util/bugtool.py	Mon Aug 28 13:05:00 2006 +0100
    10.3 @@ -43,8 +43,8 @@ TITLE_RE = re.compile(r'<title>(.*)</tit
    10.4  
    10.5  FILES_TO_SEND = [ '/var/log/' + x for x in 
    10.6                    [ 'syslog', 'messages', 'debug',
    10.7 -                    'xend.log', 'xend-debug.log', 'xenstored-trace.log',
    10.8 -                    'xen-hotplug.log' ] ]
    10.9 +                    'xen/xend.log', 'xen/xend-debug.log', 'xen/xenstored-trace.log',
   10.10 +                    'xen/xen-hotplug.log' ] ]
   10.11  #FILES_TO_SEND = [  ]
   10.12  
   10.13  
    11.1 --- a/tools/python/xen/xend/XendRoot.py	Mon Aug 28 12:59:07 2006 +0100
    11.2 +++ b/tools/python/xen/xend/XendRoot.py	Mon Aug 28 13:05:00 2006 +0100
    11.3 @@ -52,7 +52,7 @@ class XendRoot:
    11.4      block_script_dir = "/etc/xen/scripts"
    11.5  
    11.6      """Default path to the log file. """
    11.7 -    logfile_default = "/var/log/xend.log"
    11.8 +    logfile_default = "/var/log/xen/xend.log"
    11.9  
   11.10      """Default level of information to be logged."""
   11.11      loglevel_default = 'DEBUG'
    12.1 --- a/tools/python/xen/xend/server/params.py	Mon Aug 28 12:59:07 2006 +0100
    12.2 +++ b/tools/python/xen/xend/server/params.py	Mon Aug 28 13:05:00 2006 +0100
    12.3 @@ -39,8 +39,8 @@ def getenv(var, val, conv=None):
    12.4  
    12.5  # The following parameters could be placed in a configuration file.
    12.6  XEND_PID_FILE      = '/var/run/xend.pid'
    12.7 -XEND_TRACE_FILE    = '/var/log/xend.trace'
    12.8 -XEND_DEBUG_LOG     = '/var/log/xend-debug.log'
    12.9 +XEND_TRACE_FILE    = '/var/log/xen/xend.trace'
   12.10 +XEND_DEBUG_LOG     = '/var/log/xen/xend-debug.log'
   12.11  XEND_USER          = 'root'
   12.12  XEND_DEBUG         = getenv("XEND_DEBUG",     0, conv=int)
   12.13  XEND_DAEMONIZE     = getenv("XEND_DAEMONIZE", not XEND_DEBUG, conv=int)
    13.1 --- a/tools/security/python/xensec_gen/main.py	Mon Aug 28 12:59:07 2006 +0100
    13.2 +++ b/tools/security/python/xensec_gen/main.py	Mon Aug 28 13:05:00 2006 +0100
    13.3 @@ -34,7 +34,7 @@ import CGIHTTPServer
    13.4  
    13.5  gHttpPort = 7777
    13.6  gHttpDir  = '/var/lib/xensec_gen'
    13.7 -gLogFile  = '/var/log/xensec_gen.log'
    13.8 +gLogFile  = '/var/log/xen/xensec_gen.log'
    13.9  gUser     = 'nobody'
   13.10  gGroup    = 'nobody'
   13.11