openstack/devstack
Code Issues Proposed changes

Merge "Turn off tracing for service functions"

Browse Source
This commit is contained in:
Jenkins 2015-11-05 21:46:38 +00:00 committed by Gerrit Code Review
commit 6b0a3c6745
1 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
functions-common
View File

@ -1775,11 +1775,17 @@ function run_phase {
# remove extra commas from the input string (i.e. ``ENABLED_SERVICES``) # remove extra commas from the input string (i.e. ``ENABLED_SERVICES``)
# _cleanup_service_list service-list # _cleanup_service_list service-list
function _cleanup_service_list { function _cleanup_service_list {
local xtrace
xtrace=$(set +o | grep xtrace)
set +o xtrace
echo "$1" | sed -e ' echo "$1" | sed -e '
s/,,/,/g; s/,,/,/g;
s/^,//; s/^,//;
s/,$// s/,$//
' '
$xtrace
} }
# disable_all_services() removes all current services # disable_all_services() removes all current services
@ -1797,6 +1803,10 @@ function disable_all_services {
# Uses global ``ENABLED_SERVICES`` # Uses global ``ENABLED_SERVICES``
# disable_negated_services # disable_negated_services
function disable_negated_services { function disable_negated_services {
local xtrace
xtrace=$(set +o | grep xtrace)
set +o xtrace
local to_remove="" local to_remove=""
local remaining="" local remaining=""
local service local service
@ -1814,6 +1824,8 @@ function disable_negated_services {
# go through the service list. if this service appears in the "to # go through the service list. if this service appears in the "to
# be removed" list, drop it # be removed" list, drop it
ENABLED_SERVICES=$(remove_disabled_services "$remaining" "$to_remove") ENABLED_SERVICES=$(remove_disabled_services "$remaining" "$to_remove")
$xtrace
} }
# disable_service() prepares the services passed as argument to be # disable_service() prepares the services passed as argument to be
@ -1825,6 +1837,10 @@ function disable_negated_services {
# Uses global ``DISABLED_SERVICES`` # Uses global ``DISABLED_SERVICES``
# disable_service service [service ...] # disable_service service [service ...]
function disable_service { function disable_service {
local xtrace
xtrace=$(set +o | grep xtrace)
set +o xtrace
local disabled_svcs="${DISABLED_SERVICES}" local disabled_svcs="${DISABLED_SERVICES}"
local enabled_svcs=",${ENABLED_SERVICES}," local enabled_svcs=",${ENABLED_SERVICES},"
local service local service
@ -1836,6 +1852,8 @@ function disable_service {
done done
DISABLED_SERVICES=$(_cleanup_service_list "$disabled_svcs") DISABLED_SERVICES=$(_cleanup_service_list "$disabled_svcs")
ENABLED_SERVICES=$(_cleanup_service_list "$enabled_svcs") ENABLED_SERVICES=$(_cleanup_service_list "$enabled_svcs")
$xtrace
} }
# enable_service() adds the services passed as argument to the # enable_service() adds the services passed as argument to the
@ -1849,6 +1867,10 @@ function disable_service {
# Uses global ``ENABLED_SERVICES`` # Uses global ``ENABLED_SERVICES``
# enable_service service [service ...] # enable_service service [service ...]
function enable_service { function enable_service {
local xtrace
xtrace=$(set +o | grep xtrace)
set +o xtrace
local tmpsvcs="${ENABLED_SERVICES}" local tmpsvcs="${ENABLED_SERVICES}"
local service local service
for service in $@; do for service in $@; do
@ -1862,6 +1884,8 @@ function enable_service {
done done
ENABLED_SERVICES=$(_cleanup_service_list "$tmpsvcs") ENABLED_SERVICES=$(_cleanup_service_list "$tmpsvcs")
disable_negated_services disable_negated_services
$xtrace
} }
# is_service_enabled() checks if the service(s) specified as arguments are # is_service_enabled() checks if the service(s) specified as arguments are
@ -1890,6 +1914,7 @@ function is_service_enabled {
local xtrace local xtrace
xtrace=$(set +o | grep xtrace) xtrace=$(set +o | grep xtrace)
set +o xtrace set +o xtrace
local enabled=1 local enabled=1
local services=$@ local services=$@
local service local service
@ -1915,6 +1940,7 @@ function is_service_enabled {
[[ ${service} == "swift" && ${ENABLED_SERVICES} =~ "s-" ]] && enabled=0 [[ ${service} == "swift" && ${ENABLED_SERVICES} =~ "s-" ]] && enabled=0
[[ ${service} == s-* && ${ENABLED_SERVICES} =~ "swift" ]] && enabled=0 [[ ${service} == s-* && ${ENABLED_SERVICES} =~ "swift" ]] && enabled=0
done done
$xtrace $xtrace
return $enabled return $enabled
} }
@ -1922,6 +1948,10 @@ function is_service_enabled {
# remove specified list from the input string # remove specified list from the input string
# remove_disabled_services service-list remove-list # remove_disabled_services service-list remove-list
function remove_disabled_services { function remove_disabled_services {
local xtrace
xtrace=$(set +o | grep xtrace)
set +o xtrace
local service_list=$1 local service_list=$1
local remove_list=$2 local remove_list=$2
local service local service
@ -1940,6 +1970,9 @@ function remove_disabled_services {
enabled="${enabled},$service" enabled="${enabled},$service"
fi fi
done done
$xtrace
_cleanup_service_list "$enabled" _cleanup_service_list "$enabled"
} }