openstack
/
charm-rabbitmq-server
Code Issues Proposed changes

Tidy use of status_set 

The wait_app function uses juju status a bit noisly when determining
whether RabbitMQ is running or not; refactor to use log instead,
and only use status when RabbitMQ is not running when it should be.

Change-Id: I796bbec943008ae7512ddef6c54c0c9df032db3b
This commit is contained in:
James Page 2016-06-17 10:44:13 +01:00 committed by David Ames
parent 38912a540c
commit 87afc44738
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hooks/rabbit_utils.py
View File

@ -39,7 +39,7 @@ from charmhelpers.core.hookenv import (
relation_ids,
related_units,
log, ERROR,
INFO,
INFO, DEBUG,
service_name,
status_set,
cached,
@ -331,17 +331,16 @@ def wait_app():
else:
pid_file = '/var/lib/rabbitmq/mnesia/rabbit@' \
+ get_local_nodename() + '.pid'
status_set('maintenance', 'Waiting for rabbitmq app to start: {}'
''.format(pid_file))
log('Waiting for rabbitmq app to start: {}'.format(pid_file), DEBUG)
try:
rabbitmqctl('wait', pid_file)
log('Confirmed rabbitmq app is running')
log('Confirmed rabbitmq app is running', DEBUG)
return True
except subprocess.CalledProcessError as ex:
status_set('blocked', 'Rabbitmq failed to start')
status_set('blocked', 'RabbitMQ failed to start')
try:
status_cmd = ['rabbitmqctl', 'status']
log(subprocess.check_output(status_cmd), 'DEBUG')
log(subprocess.check_output(status_cmd), DEBUG)
except:
pass
raise ex