openstack/devstack
Code Issues Proposed changes

Handle nested xtrace states

Browse Source 
The lib/database abstraction includes the appropriate database file that also
contains the $XTRACE bits at entry and exit.  The nested XTRACE handling overwrote
the value from lib/database.  So...make the nested files use their own
XTRACE variables.

Change-Id: Ibdfc8d7d1e1457a9bc889b781ce176b417789ea1
This commit is contained in:
Dean Troyer 2013-01-28 14:04:39 -06:00
parent 3b3a6d78a6
commit 41bf452023
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/databases/mysql
View File

@ -5,7 +5,7 @@
# DATABASE_{HOST,USER,PASSWORD} must be defined
# Save trace setting
XTRACE=$(set +o | grep xtrace)
MY_XTRACE=$(set +o | grep xtrace)
set +o xtrace
register_database mysql
@ -121,4 +121,4 @@ function database_connection_url_mysql {
}
# Restore xtrace
$XTRACE
$MY_XTRACE

4
lib/databases/postgresql
View File

@ -5,7 +5,7 @@
# DATABASE_{HOST,USER,PASSWORD} must be defined
# Save trace setting
XTRACE=$(set +o | grep xtrace)
PG_XTRACE=$(set +o | grep xtrace)
set +o xtrace
register_database postgresql
@ -76,4 +76,4 @@ function database_connection_url_postgresql {
}
# Restore xtrace
$XTRACE
$PG_XTRACE