openstack/devstack-gate
Code Issues Proposed changes

Check for rabbitmq before archiving

Browse Source 
Don't assume rabbitmq related files exist

Change-Id: I7bd9e92824bc3cc5d736aee004c02724e213a903
This commit is contained in:
Ian Wienand
2014-05-12 11:26:10 +10:00
parent 299ce250a1
commit f5f61c8672
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
functions.sh
View File

@@ -390,8 +390,14 @@ function cleanup_host {
sudo cp /var/log/syslog $BASE/logs/syslog.txt
sudo cp /var/log/kern.log $BASE/logs/kern_log.txt
sudo cp /var/log/apache2/horizon_error.log $BASE/logs/horizon_error.log
sudo mkdir $BASE/logs/rabbitmq/
sudo cp /var/log/rabbitmq/* $BASE/logs/rabbitmq/
# rabbitmq logs
if [ -d /var/log/rabbitmq ]; then
sudo mkdir $BASE/logs/rabbitmq/
sudo cp /var/log/rabbitmq/* $BASE/logs/rabbitmq/
fi
# libvirt
if [ -d /var/log/libvirt ] ; then
sudo cp /var/log/libvirt/libvirtd*.log $BASE/logs/
fi
@@ -477,8 +483,10 @@ function cleanup_host {
rename 's/(.*)/$1.txt/' $BASE/logs/sudoers.d/*
rename 's/\.log$/.txt/' $BASE/logs/rabbitmq/*
sudo mv $BASE/logs/rabbitmq/startup_log \
$BASE/logs/rabbitmq/startup_log.txt
if [ -f $BASE/logs/rabbitmq/startup_log ]; then
sudo mv $BASE/logs/rabbitmq/startup_log \
$BASE/logs/rabbitmq/startup_log.txt
fi
# Remove duplicate logs
sudo rm $BASE/logs/*.*.txt