X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_mon%2Fplugins%2FOpenStack%2FAodh%2Fnotifier.py;h=c43f23828236c8170b577c4538433529fe72322e;hb=b5b7819197730f5000d90a60ed13b32ba4e18fad;hp=92674cb80800e0aa6240e9e4db1305633e7eaa91;hpb=a4ffa936b4f8a2bfcd1b64541e00c93aac449a56;p=osm%2FMON.git diff --git a/osm_mon/plugins/OpenStack/Aodh/notifier.py b/osm_mon/plugins/OpenStack/Aodh/notifier.py index 92674cb..c43f238 100644 --- a/osm_mon/plugins/OpenStack/Aodh/notifier.py +++ b/osm_mon/plugins/OpenStack/Aodh/notifier.py @@ -32,11 +32,14 @@ from six.moves.BaseHTTPServer import BaseHTTPRequestHandler from six.moves.BaseHTTPServer import HTTPServer # Initialise a logger for alarm notifier +from osm_mon.core.settings import Config + +cfg = Config.instance() logging.basicConfig(stream=sys.stdout, - format='%(asctime)s %(message)s', + format='%(asctime)s - %(name)s - %(levelname)s - %(message)s', datefmt='%m/%d/%Y %I:%M:%S %p', - level=logging.INFO) + level=logging.getLevelName(cfg.OSMMON_LOG_LEVEL)) log = logging.getLogger(__name__) sys.path.append(os.path.abspath(os.path.join(os.path.realpath(__file__), '..', '..', '..', '..', '..'))) @@ -72,11 +75,11 @@ class NotifierHandler(BaseHTTPRequestHandler): post_data = post_data.decode() except AttributeError: pass - log.info("This alarm was triggered: %s", json.dumps(post_data)) + log.info("This alarm was triggered: %s", post_data) # Send alarm notification to message bus try: - self.notify_alarm(json.dumps(post_data)) + self.notify_alarm(json.loads(post_data)) except Exception: log.exception("Error notifying alarm")