summaryrefslogtreecommitdiff
path: root/cloudinit/reporting
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2015-08-06 23:51:17 -0500
committerScott Moser <smoser@ubuntu.com>2015-08-06 23:51:17 -0500
commitfc5fc6e476059327d4063f165170cdde01db4100 (patch)
treef03b2feda3a4eecd339a821d6219ac3ef9c07428 /cloudinit/reporting
parentebd393e56ba21f8a84571dff499e6d6fb6852042 (diff)
downloadvyos-cloud-init-fc5fc6e476059327d4063f165170cdde01db4100.tar.gz
vyos-cloud-init-fc5fc6e476059327d4063f165170cdde01db4100.zip
add the webhook handler
Diffstat (limited to 'cloudinit/reporting')
-rw-r--r--cloudinit/reporting/__init__.py11
-rw-r--r--cloudinit/reporting/handlers.py15
2 files changed, 20 insertions, 6 deletions
diff --git a/cloudinit/reporting/__init__.py b/cloudinit/reporting/__init__.py
index d0bc14e3..b9d4f679 100644
--- a/cloudinit/reporting/__init__.py
+++ b/cloudinit/reporting/__init__.py
@@ -9,8 +9,8 @@ The reporting framework is intended to allow all parts of cloud-init to
report events in a structured manner.
"""
-from cloudinit.registry import DictRegistry
-from cloudinit.reporting.handlers import available_handlers
+from ..registry import DictRegistry
+from ..reporting.handlers import available_handlers
FINISH_EVENT_TYPE = 'finish'
@@ -18,6 +18,7 @@ START_EVENT_TYPE = 'start'
DEFAULT_CONFIG = {
'logging': {'type': 'log'},
+ 'print': {'type': 'print'},
}
@@ -83,8 +84,14 @@ def update_configuration(config):
instantiated_handler_registry.unregister_item(
handler_name, force=True)
continue
+ registered = instantiated_handler_registry.registered_items
handler_config = handler_config.copy()
cls = available_handlers.registered_items[handler_config.pop('type')]
+ if (handler_name in registered and
+ (registered[handler_name] == handler_config)):
+ continue
+ else:
+ instantiated_handler_registry.unregister_item(handler_name)
instance = cls(**handler_config)
instantiated_handler_registry.register_item(handler_name, instance)
diff --git a/cloudinit/reporting/handlers.py b/cloudinit/reporting/handlers.py
index d8f69641..a962edae 100644
--- a/cloudinit/reporting/handlers.py
+++ b/cloudinit/reporting/handlers.py
@@ -6,9 +6,8 @@ import oauthlib.oauth1 as oauth1
import six
-from cloudinit.registry import DictRegistry
-from cloudinit import url_helper
-from cloudinit import util
+from ..registry import DictRegistry
+from .. import (url_helper, util)
@six.add_metaclass(abc.ABCMeta)
@@ -34,13 +33,19 @@ class LogHandler(ReportingHandler):
logger.info(event.as_string())
+class PrintHandler(ReportingHandler):
+ def publish_event(self, event):
+ """Publish an event to the ``INFO`` log level."""
+ print(event.as_string())
+
+
class WebHookHandler(ReportingHandler):
def __init__(self, endpoint, consumer_key=None, token_key=None,
token_secret=None, consumer_secret=None, timeout=None,
retries=None):
super(WebHookHandler, self).__init__()
- if any(consumer_key, token_key, token_secret, consumer_secret):
+ if any([consumer_key, token_key, token_secret, consumer_secret]):
self.oauth_helper = url_helper.OauthHelper(
consumer_key=consumer_key, token_key=token_key,
token_secret=token_secret, consumer_secret=consumer_secret)
@@ -64,3 +69,5 @@ class WebHookHandler(ReportingHandler):
available_handlers = DictRegistry()
available_handlers.register_item('log', LogHandler)
+available_handlers.register_item('print', PrintHandler)
+available_handlers.register_item('webhook', WebHookHandler)