openstack/charm-swift-proxy
Code Issues Proposed changes

Revert "Save/restore paused status in decorator to prevent functions like config-changed from overwriting it"

Browse Source
This commit is contained in:
Corey Bryant
2015-10-13 08:06:09 -04:00
parent 7ca06961b9
commit 13cc6913ff
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/swift_utils.py
View File

@@ -1001,11 +1001,7 @@ def pause_aware_restart_on_change(restart_map):
"""Avoids restarting services if config changes when unit is paused.""" """Avoids restarting services if config changes when unit is paused."""
def wrapper(f): def wrapper(f):
if is_paused(): if is_paused():
# save/restore paused status in case called function changes it return f
status, message = status_get()
ret = f
status_set(status, message)
return ret
else: else:
return restart_on_change(restart_map)(f) return restart_on_change(restart_map)(f)
return wrapper return wrapper