openstack
/
aodh
Code Issues Proposed changes

Merge "Fix conf not exist zaqar_client not define error"

This commit is contained in:
Zuul 2018-04-23 02:27:05 +00:00 committed by Gerrit Code Review
parent 605e57ae0e 342b8ad657
commit 7283d60b7c
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
aodh/notifier/zaqar.py
View File

@ -159,11 +159,13 @@ class ZaqarAlarmNotifier(notifier.AlarmNotifier):
# provide enough information about that. Otherwise, go to build
# a client with service account and queue name for this alarm.
conf, queue_name = self._get_presigned_client_conf(queue_info)
if conf is not None:
if conf is None:
zaqar_client = self.client
else:
zaqar_client = self.get_zaqar_client(conf)
if conf is None or queue_name is None or zaqar_client is None:
zaqar_client = self.client
if queue_name is None:
# queue_name is a combination of <alarm-id>-<topic>
queue_name = "%s-%s" % (message['body']['alarm_id'],
queue_info.get('topic')[-1])