openstack/charm-swift-proxy
Code Issues Proposed changes

Don't overwrite paused status in main()

Browse Source
This commit is contained in:
Corey Bryant
2015-10-12 16:42:41 +00:00
parent 3f1aca9849
commit 1228afe034
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
hooks/swift_hooks.py
View File

@@ -35,6 +35,7 @@ from lib.swift_utils import (
is_paused, is_paused,
pause_aware_restart_on_change, pause_aware_restart_on_change,
assess_status, assess_status,
is_paused,
) )
import charmhelpers.contrib.openstack.utils as openstack import charmhelpers.contrib.openstack.utils as openstack
@@ -526,6 +527,8 @@ def main():
hooks.execute(sys.argv) hooks.execute(sys.argv)
except UnregisteredHookError as e: except UnregisteredHookError as e:
log('Unknown hook {} - skipping.'.format(e), level=DEBUG) log('Unknown hook {} - skipping.'.format(e), level=DEBUG)
# Don't overwrite paused status
if not is_paused():
assess_status(CONFIGS) assess_status(CONFIGS)