[ovs-dev] [PATCH] ovs-bugtool: Indiscriminately capture all openvswitch log files.
Ethan Jackson
ethan at nicira.com
Tue Jan 25 19:29:04 UTC 2011
ovs-bugtool was only capturing openvswitch core files. This commit
causes it to capture all files under /var/log/openvswitch and
/var/log/core. It also moves the ovs-bugtool output to
/var/log/ovs-bugtool.
Reported-by: Ben Pfaff <blp at nicira.com>
Bug #4481.
---
debian/ovs-bugtool | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/debian/ovs-bugtool b/debian/ovs-bugtool
index 6a435e6..9bdf289 100755
--- a/debian/ovs-bugtool
+++ b/debian/ovs-bugtool
@@ -64,7 +64,7 @@ OS_RELEASE = platform.release()
# Files & directories
#
-BUG_DIR = "/var/log/openvswitch"
+BUG_DIR = "/var/log/ovs-bugtool"
PLUGIN_DIR = "/etc/openvswitch/bugtool"
GRUB_CONFIG = '/boot/grub/menu.lst'
BOOT_KERNEL = '/boot/vmlinuz-' + OS_RELEASE
@@ -93,13 +93,14 @@ HOSTS = '/etc/hosts'
HOSTS_ALLOW = '/etc/hosts.allow'
HOSTS_DENY = '/etc/hosts.deny'
DHCP_LEASE_DIR = '/var/lib/dhcp3'
-OPENVSWITCH_CORE_DIR = '/var/log/openvswitch/cores'
+OPENVSWITCH_LOG_DIR = '/var/log/openvswitch'
OPENVSWITCH_DEFAULT_SWITCH = '/etc/default/openvswitch-switch'
OPENVSWITCH_DEFAULT_CONTROLLER = '/etc/default/openvswitch-controller'
OPENVSWITCH_CONF_DB = '/etc/openvswitch/conf.db'
OPENVSWITCH_VSWITCHD_PID = '/var/run/openvswitch/ovs-vswitchd.pid'
COLLECTD_LOGS_DIR = '/var/lib/collectd/rrd'
VAR_LOG_DIR = '/var/log/'
+VAR_LOG_CORE_DIR = '/var/log/core'
X11_LOGS_DIR = VAR_LOG_DIR
X11_LOGS_RE = re.compile(r'.*/Xorg\..*$')
X11_AUTH_DIR = '/root/'
@@ -509,7 +510,7 @@ exclude those logs from the archive.
pass
cmd_output(CAP_NETWORK_STATUS, [TC, '-s', 'qdisc'])
file_output(CAP_NETWORK_STATUS, [PROC_NET_SOFTNET_STAT])
- tree_output(CAP_NETWORK_STATUS, OPENVSWITCH_CORE_DIR)
+ tree_output(CAP_NETWORK_STATUS, OPENVSWITCH_LOG_DIR)
if os.path.exists(OPENVSWITCH_VSWITCHD_PID):
cmd_output(CAP_NETWORK_STATUS, [OVS_DPCTL, 'show'])
for d in dp_list():
@@ -548,6 +549,7 @@ exclude those logs from the archive.
tree_output(CAP_X11_LOGS, X11_LOGS_DIR, X11_LOGS_RE)
tree_output(CAP_X11_AUTH, X11_AUTH_DIR, X11_AUTH_RE)
+ tree_output(CAP_SYSTEM_LOGS, VAR_LOG_CORE_DIR)
try:
--
1.7.2
More information about the dev
mailing list