openstack
/
devstack-plugin-amqp1
Code Issues Proposed changes

Set the qpidd output logfile permissions. 

Also removes the explicit disabling of trace.  This will help
facilitate debugging in the future.

Change-Id: I6db5bd23492f2387fad1a0a223e0e4526e1c4015
This commit is contained in:
Kenneth Giusti 2015-11-06 11:46:45 -05:00
parent 0a179bf682
commit 8829503ec9
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
devstack/plugin.sh
View File

@ -31,10 +31,6 @@
# AMQP1_{USERNAME,PASSWORD} - for authentication with AMQP1_HOST # AMQP1_{USERNAME,PASSWORD} - for authentication with AMQP1_HOST
# #
# Save trace setting
XTRACE=$(set +o | grep xtrace)
set +o xtrace
# builds transport url string # builds transport url string
function _get_amqp1_transport_url { function _get_amqp1_transport_url {
echo "amqp://$AMQP1_USERNAME:$AMQP1_PASSWORD@$AMQP1_HOST:5672/" echo "amqp://$AMQP1_USERNAME:$AMQP1_PASSWORD@$AMQP1_HOST:5672/"
@ -132,14 +128,19 @@ EOF
if ! $QPIDD --help | grep -q "queue-patterns"; then if ! $QPIDD --help | grep -q "queue-patterns"; then
exit_distro_not_supported "qpidd with AMQP 1.0 support" exit_distro_not_supported "qpidd with AMQP 1.0 support"
fi fi
local log_file=$LOGDIR/qpidd.log
if ! grep -q "queue-patterns=exclusive" $qpid_conf_file; then if ! grep -q "queue-patterns=exclusive" $qpid_conf_file; then
cat <<EOF | sudo tee --append $qpid_conf_file cat <<EOF | sudo tee --append $qpid_conf_file
queue-patterns=exclusive queue-patterns=exclusive
queue-patterns=unicast queue-patterns=unicast
topic-patterns=broadcast topic-patterns=broadcast
log-to-file=$LOGDIR/qpidd.log log-enable=info+
log-to-file=$log_file
log-to-syslog=yes
EOF EOF
fi fi
sudo touch $log_file
sudo chmod a+rw $log_file # qpidd user can write to it
} }
@ -263,10 +264,6 @@ if is_service_enabled amqp1; then
fi fi
# Restore xtrace
$XTRACE
# Tell emacs to use shell-script-mode # Tell emacs to use shell-script-mode
## Local variables: ## Local variables:
## mode: shell-script ## mode: shell-script