diff options
| author | Justin Pettit <jpettit@nicira.com> | 2009-09-12 00:49:30 -0700 |
|---|---|---|
| committer | Justin Pettit <jpettit@nicira.com> | 2009-09-12 00:49:30 -0700 |
| commit | 39fb08818bbd9c438dbf23caa89937c663451b5a (patch) | |
| tree | a317d5161f3a7efd4e6e7cc5ccbf54d6807e5fe7 /xenserver | |
| parent | 6867bc3633fc5734eb81cd8684f0fed5df319bdd (diff) | |
| parent | 7646deb6ec8c3a319573ac9ea9a19a60994f7cf3 (diff) | |
Merge commit 'origin/citrix'
Conflicts:
vswitchd/ovs-vswitchd.8.in
vswitchd/ovs-vswitchd.conf.5.in
xenserver/etc_init.d_vswitch
Diffstat (limited to 'xenserver')
| -rwxr-xr-x | xenserver/etc_init.d_vswitch | 18 | ||||
| -rw-r--r-- | xenserver/etc_logrotate.d_vswitch | 6 |
2 files changed, 16 insertions, 8 deletions
diff --git a/xenserver/etc_init.d_vswitch b/xenserver/etc_init.d_vswitch index 8bb8e2a7..8f0adf79 100755 --- a/xenserver/etc_init.d_vswitch +++ b/xenserver/etc_init.d_vswitch @@ -34,8 +34,8 @@ test -e /etc/sysconfig/vswitch && . /etc/sysconfig/vswitch : ${VSWITCHD_RUN_DIR:=/var/xen/vswitch} : ${VSWITCHD_PRIORITY:=-10} : ${VSWITCHD_LOGFILE:=/var/log/ovs-vswitchd.log} -: ${VSWITCHD_FILE_LOGLEVEL:=} -: ${VSWITCHD_SYSLOG_LOGLEVEL:=WARN} +: ${VSWITCHD_FILE_LOGLEVEL:=INFO} +: ${VSWITCHD_SYSLOG_LOGLEVEL:=ERR} : ${VSWITCHD_MEMLEAK_LOGFILE:=} : ${VSWITCHD_STRACE_LOG:=} : ${VSWITCHD_STRACE_OPT:=} @@ -47,8 +47,8 @@ test -e /etc/sysconfig/vswitch && . /etc/sysconfig/vswitch : ${BRCOMPATD_RUN_DIR:=/var/xen/vswitch} : ${BRCOMPATD_PRIORITY:=-10} : ${BRCOMPATD_LOGFILE:=/var/log/ovs-brcompatd.log} -: ${BRCOMPATD_FILE_LOGLEVEL:=} -: ${BRCOMPATD_SYSLOG_LOGLEVEL:=INFO} +: ${BRCOMPATD_FILE_LOGLEVEL:=INFO} +: ${BRCOMPATD_SYSLOG_LOGLEVEL:=ERR} : ${BRCOMPATD_MEMLEAK_LOGFILE:=} : ${BRCOMPATD_STRACE_LOG:=} : ${BRCOMPATD_STRACE_OPT:=} @@ -111,6 +111,13 @@ function reload_vswitchd { fi } +function reload_brcompatd { + if [ -f "$BRCOMPATD_PIDFILE" ]; then + "$appctl" \ + --target=ovs-brcompatd.$(cat "$BRCOMPATD_PIDFILE").ctl --reopen + fi +} + function start_vswitchd { local syslog_opt="-vANY:SYSLOG:${VSWITCHD_SYSLOG_LOGLEVEL}" local logfile_file_opt="" @@ -165,7 +172,7 @@ function start_brcompatd { mkdir -p "$BRCOMPATD_RUN_DIR" fi cd "$BRCOMPATD_RUN_DIR" - if [ ! -n "$BRCOMPATD_FILE_LOGLEVEL" ]; then + if [ -n "$BRCOMPATD_FILE_LOGLEVEL" ]; then logfile_level_opt="-vANY:FILE:${BRCOMPATD_FILE_LOGLEVEL}" logfile_file_opt="--log-file=$BRCOMPATD_LOGFILE" fi @@ -288,6 +295,7 @@ case "$1" in ;; reload) reload_vswitchd + reload_brcompatd ;; strace-vswitchd) shift diff --git a/xenserver/etc_logrotate.d_vswitch b/xenserver/etc_logrotate.d_vswitch index dae235bd..6366c675 100644 --- a/xenserver/etc_logrotate.d_vswitch +++ b/xenserver/etc_logrotate.d_vswitch @@ -5,10 +5,10 @@ # notice and this notice are preserved. This file is offered as-is, # without warranty of any kind. -/var/log/ovs-vswitchd.log { +/var/log/ovs-vswitchd.log /var/log/ovs-brcompatd.log { sharedscripts postrotate - # Send sighup to vswitch which will cause it to reopen its log files. - /sbin/service vswitch reload + # Tell ovs-vswitchd and ovs-brcompatd to reopen their log files + /sbin/service vswitch reload endscript } |