Fix conf not exist zaqar_client not define error
Change-Id: I8b2676c3745e7e1f375f24b72032e5fab4354988 Signed-off-by: Yuanbin.Chen <cybing4@gmail.com>
This commit is contained in:
parent
e99c6f3e8c
commit
342b8ad657
|
@ -159,11 +159,13 @@ class ZaqarAlarmNotifier(notifier.AlarmNotifier):
|
||||||
# provide enough information about that. Otherwise, go to build
|
# provide enough information about that. Otherwise, go to build
|
||||||
# a client with service account and queue name for this alarm.
|
# a client with service account and queue name for this alarm.
|
||||||
conf, queue_name = self._get_presigned_client_conf(queue_info)
|
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)
|
zaqar_client = self.get_zaqar_client(conf)
|
||||||
|
|
||||||
if conf is None or queue_name is None or zaqar_client is None:
|
if queue_name is None:
|
||||||
zaqar_client = self.client
|
|
||||||
# queue_name is a combination of <alarm-id>-<topic>
|
# queue_name is a combination of <alarm-id>-<topic>
|
||||||
queue_name = "%s-%s" % (message['body']['alarm_id'],
|
queue_name = "%s-%s" % (message['body']['alarm_id'],
|
||||||
queue_info.get('topic')[-1])
|
queue_info.get('topic')[-1])
|
||||||
|
|
Loading…
Reference in New Issue