openstack/deb-ceilometer
Code Issues Proposed changes

Store and restore the xtrace option in devstack plugin

Browse Source 
Otherwise we might upset the xtrace setting in other files.

Change-Id: I93e7654fb67f455d3cbedb1e6cd010651d8d67dd
This commit is contained in:
Chris Dent 2015-07-16 12:49:13 +00:00
parent a744e1b9e7
commit 6d7c7cb00a
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
devstack/plugin.sh
View File

@ -38,6 +38,10 @@
# CEILOMETER_COORDINATION_URL: URL for group membership service provided by tooz. # CEILOMETER_COORDINATION_URL: URL for group membership service provided by tooz.
# CEILOMETER_EVENTS: Set to True to enable event collection # CEILOMETER_EVENTS: Set to True to enable event collection
# Save trace setting
XTRACE=$(set +o | grep xtrace)
set -o xtrace
# Support potential entry-points console scripts in VENV or not # Support potential entry-points console scripts in VENV or not
if [[ ${USE_VENV} = True ]]; then if [[ ${USE_VENV} = True ]]; then
PROJECT_VENV["ceilometer"]=${CEILOMETER_DIR}.venv PROJECT_VENV["ceilometer"]=${CEILOMETER_DIR}.venv
@ -412,3 +416,6 @@ if is_service_enabled ceilometer; then
cleanup_ceilometer cleanup_ceilometer
fi fi
fi fi
# Restore xtrace
$XTRACE