projects
/
osm
/
MON.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "[MON] Fixes notifier bug during alarm triggering"
[osm/MON.git]
/
osm_mon
/
plugins
/
OpenStack
/
Aodh
/
alarming.py
diff --git
a/osm_mon/plugins/OpenStack/Aodh/alarming.py
b/osm_mon/plugins/OpenStack/Aodh/alarming.py
index
44b8fdd
..
f380b4e
100644
(file)
--- a/
osm_mon/plugins/OpenStack/Aodh/alarming.py
+++ b/
osm_mon/plugins/OpenStack/Aodh/alarming.py
@@
-177,7
+177,7
@@
class Alarming(object):
log.exception("Error updating alarm")
raise e
finally:
log.exception("Error updating alarm")
raise e
finally:
- self._generate_and_send_response('
cre
ate_alarm_response',
+ self._generate_and_send_response('
upd
ate_alarm_response',
alarm_details['correlation_id'],
status=status,
alarm_id=alarm_id)
alarm_details['correlation_id'],
status=status,
alarm_id=alarm_id)
@@
-387,13
+387,13
@@
class Alarming(object):
log.exception("Desired Gnocchi metric not found:", e)
raise e
log.exception("Desired Gnocchi metric not found:", e)
raise e
- def _generate_and_send_response(self,
topic
, correlation_id, **kwargs):
+ def _generate_and_send_response(self,
key
, correlation_id, **kwargs):
try:
resp_message = self._response.generate_response(
try:
resp_message = self._response.generate_response(
-
topic
, cor_id=correlation_id, **kwargs)
+
key
, cor_id=correlation_id, **kwargs)
log.info("Response Message: %s", resp_message)
log.info("Response Message: %s", resp_message)
- self._producer.
create
_alarm_response(
-
topic
, resp_message)
+ self._producer.
publish
_alarm_response(
+
key
, resp_message)
except Exception as e:
log.exception("Response creation failed:")
raise e
except Exception as e:
log.exception("Response creation failed:")
raise e