Jiří Moskovčák has uploaded a new change for review. Change subject: changed the loggers names to use hierachy ......................................................................
changed the loggers names to use hierachy - with that change it's possible to set the log level for the whole package, so users like vdsm can set the required log level without knowing the exact logger name Change-Id: I40fb7aca813800dd445e858406034736817cac9c Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1032667 Signed-off-by: Jiri Moskovcak <[email protected]> --- M ovirt_hosted_engine_ha/agent/agent.py M ovirt_hosted_engine_ha/agent/hosted_engine.py M ovirt_hosted_engine_ha/broker/broker.py M ovirt_hosted_engine_ha/broker/listener.py M ovirt_hosted_engine_ha/broker/monitor.py M ovirt_hosted_engine_ha/broker/notifications.py M ovirt_hosted_engine_ha/broker/storage_broker.py M ovirt_hosted_engine_ha/broker/submonitor_base.py M ovirt_hosted_engine_ha/broker/submonitors/cpu_load_no_engine.py M ovirt_hosted_engine_ha/broker/submonitors/engine_health.py M ovirt_hosted_engine_ha/broker/submonitors/mem_free.py M ovirt_hosted_engine_ha/broker/submonitors/mem_load.py M ovirt_hosted_engine_ha/broker/submonitors/mgmt_bridge.py M ovirt_hosted_engine_ha/broker/submonitors/ping.py M ovirt_hosted_engine_ha/broker/test/test_monitor.py M ovirt_hosted_engine_ha/client/client.py M ovirt_hosted_engine_ha/lib/brokerlink.py 17 files changed, 24 insertions(+), 23 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-hosted-engine-ha refs/changes/71/22371/1 diff --git a/ovirt_hosted_engine_ha/agent/agent.py b/ovirt_hosted_engine_ha/agent/agent.py index e9a7b9f..861a637 100644 --- a/ovirt_hosted_engine_ha/agent/agent.py +++ b/ovirt_hosted_engine_ha/agent/agent.py @@ -121,9 +121,9 @@ except (ConfigParser.Error, ImportError, NameError, TypeError): logging.basicConfig(filename='/dev/stdout', filemode='w+', level=logging.DEBUG) - log = logging.getLogger("Broker") + log = logging.getLogger("%s.Broker" % (__name__)) log.warn("Could not inititialize logging", exc_info=True) - self._log = logging.getLogger("Broker") + self._log = logging.getLogger("%s.Broker" % (__name__)) def _get_signal_map(self): return {signal.SIGINT: self._handle_quit, diff --git a/ovirt_hosted_engine_ha/agent/hosted_engine.py b/ovirt_hosted_engine_ha/agent/hosted_engine.py index d01ab44..87eaf5d 100644 --- a/ovirt_hosted_engine_ha/agent/hosted_engine.py +++ b/ovirt_hosted_engine_ha/agent/hosted_engine.py @@ -106,7 +106,7 @@ is a callback returning True/False depending on whether ha agent shutdown has been requested. """ - self._log = logging.getLogger("HostedEngine") + self._log = logging.getLogger("%s.HostedEngine" % (__name__)) self._log.addFilter(log_filter.IntermittentFilter()) self._shutdown_requested_callback = shutdown_requested_callback diff --git a/ovirt_hosted_engine_ha/broker/broker.py b/ovirt_hosted_engine_ha/broker/broker.py index 60eddf0..d9da56b 100644 --- a/ovirt_hosted_engine_ha/broker/broker.py +++ b/ovirt_hosted_engine_ha/broker/broker.py @@ -129,9 +129,9 @@ except (ConfigParser.Error, ImportError, NameError, TypeError): logging.basicConfig(filename='/dev/stdout', filemode='w+', level=logging.DEBUG) - log = logging.getLogger("Broker") + log = logging.getLogger("%s.Broker" % (__name__)) log.warn("Could not inititialize logging", exc_info=True) - self._log = logging.getLogger("Broker") + self._log = logging.getLogger("%s.Broker" % (__name__)) def _get_signal_map(self): return {signal.SIGINT: self._handle_quit, diff --git a/ovirt_hosted_engine_ha/broker/listener.py b/ovirt_hosted_engine_ha/broker/listener.py index f9d35d4..eb2c3af 100644 --- a/ovirt_hosted_engine_ha/broker/listener.py +++ b/ovirt_hosted_engine_ha/broker/listener.py @@ -37,7 +37,7 @@ """ Prepare the listener and associated locks """ - self._log = logging.getLogger("Listener") + self._log = logging.getLogger("%s.Listener" % (__name__)) self._log.info("Initializing SocketServer") # Coordinate access to resources across connections @@ -130,7 +130,7 @@ Initialize connection handler class and identify connection. """ if not hasattr(self, '_log'): - self._log = logging.getLogger("ConnectionHandler") + self._log = logging.getLogger("%s.ConnectionHandler" % (__name__)) self._log.info("Connection established") self.request.settimeout(0.7) SocketServer.BaseRequestHandler.setup(self) diff --git a/ovirt_hosted_engine_ha/broker/monitor.py b/ovirt_hosted_engine_ha/broker/monitor.py index c77d62c..404a1b0 100644 --- a/ovirt_hosted_engine_ha/broker/monitor.py +++ b/ovirt_hosted_engine_ha/broker/monitor.py @@ -26,7 +26,7 @@ class Monitor(object): def __init__(self): - self._log = logging.getLogger("Monitor") + self._log = logging.getLogger("%s.Monitor" % (__name__)) self._active_submonitors = {} self._submonitors = {} diff --git a/ovirt_hosted_engine_ha/broker/notifications.py b/ovirt_hosted_engine_ha/broker/notifications.py index 4c670d5..14ca789 100644 --- a/ovirt_hosted_engine_ha/broker/notifications.py +++ b/ovirt_hosted_engine_ha/broker/notifications.py @@ -27,7 +27,7 @@ server.quit() return True except (smtplib.SMTPException, socket.error) as e: - logging.getLogger("Notifications").exception(e) + logging.getLogger("%s.Notifications" % (__name__)).exception(e) return False @@ -37,7 +37,8 @@ The configuration is refreshed with every call of this method. """ - logging.getLogger("Notifications").debug("nofity: %s" % (repr(kwargs),)) + logging.getLogger("%s.Notifications" % (__name__))\ + .debug("nofity: %s" % (repr(kwargs),)) assert "type" in kwargs type = kwargs["type"] @@ -59,7 +60,7 @@ template_path = os.path.join(constants.NOTIFY_TEMPLATES, type+".txt") template = open(template_path).read() except (OSError, IOError) as e: - logging.getLogger("Notifications").exception(e) + logging.getLogger("%s.Notifications" % (__name__)).exception(e) return False # default SMTP configuration @@ -85,7 +86,7 @@ try: email_body = template.format(**kwargs) except KeyError as e: - logging.getLogger("Notifications").exception(e) + logging.getLogger("%s.Notifications" % (__name__)).exception(e) return False return send_email(smtp_config, email_body) diff --git a/ovirt_hosted_engine_ha/broker/storage_broker.py b/ovirt_hosted_engine_ha/broker/storage_broker.py index 0f75017..3074dea 100644 --- a/ovirt_hosted_engine_ha/broker/storage_broker.py +++ b/ovirt_hosted_engine_ha/broker/storage_broker.py @@ -30,7 +30,7 @@ class StorageBroker(object): def __init__(self): - self._log = logging.getLogger("StorageBroker") + self._log = logging.getLogger("%s.StorageBroker" % (__name__)) self._storage_access_lock = threading.Lock() def get_all_stats_for_service_type(self, storage_dir, service_type): diff --git a/ovirt_hosted_engine_ha/broker/submonitor_base.py b/ovirt_hosted_engine_ha/broker/submonitor_base.py index 3ec5f13..8e33585 100644 --- a/ovirt_hosted_engine_ha/broker/submonitor_base.py +++ b/ovirt_hosted_engine_ha/broker/submonitor_base.py @@ -39,7 +39,7 @@ self._options = options self._last_result = None self._initialization_status = None - self._baselog = logging.getLogger("SubmonitorBase") + self._baselog = logging.getLogger("%s.SubmonitorBase" % (__name__)) def setup(self, options): """ diff --git a/ovirt_hosted_engine_ha/broker/submonitors/cpu_load_no_engine.py b/ovirt_hosted_engine_ha/broker/submonitors/cpu_load_no_engine.py index 7f55dfa..e008854 100644 --- a/ovirt_hosted_engine_ha/broker/submonitors/cpu_load_no_engine.py +++ b/ovirt_hosted_engine_ha/broker/submonitors/cpu_load_no_engine.py @@ -36,7 +36,7 @@ class Submonitor(submonitor_base.SubmonitorBase): def setup(self, options): - self._log = logging.getLogger("EngineHealth") + self._log = logging.getLogger("%s.EngineHealth" % (__name__)) self._log.addFilter(log_filter.IntermittentFilter()) self._address = options.get('address') diff --git a/ovirt_hosted_engine_ha/broker/submonitors/engine_health.py b/ovirt_hosted_engine_ha/broker/submonitors/engine_health.py index 632d6df..5292e14 100644 --- a/ovirt_hosted_engine_ha/broker/submonitors/engine_health.py +++ b/ovirt_hosted_engine_ha/broker/submonitors/engine_health.py @@ -35,7 +35,7 @@ class Submonitor(submonitor_base.SubmonitorBase): def setup(self, options): - self._log = logging.getLogger("CpuLoadNoEngine") + self._log = logging.getLogger("%s.CpuLoadNoEngine" % (__name__)) self._log.addFilter(log_filter.IntermittentFilter()) self._address = options.get('address') diff --git a/ovirt_hosted_engine_ha/broker/submonitors/mem_free.py b/ovirt_hosted_engine_ha/broker/submonitors/mem_free.py index 141f0b0..0f95fad 100644 --- a/ovirt_hosted_engine_ha/broker/submonitors/mem_free.py +++ b/ovirt_hosted_engine_ha/broker/submonitors/mem_free.py @@ -31,7 +31,7 @@ class Submonitor(submonitor_base.SubmonitorBase): def setup(self, options): - self._log = logging.getLogger("MemFree") + self._log = logging.getLogger("%s.MemFree" % (__name__)) self._log.addFilter(log_filter.IntermittentFilter()) self._address = options.get('address') self._use_ssl = util.to_bool(options.get('use_ssl')) diff --git a/ovirt_hosted_engine_ha/broker/submonitors/mem_load.py b/ovirt_hosted_engine_ha/broker/submonitors/mem_load.py index be4fcd5..3d7bfb6 100644 --- a/ovirt_hosted_engine_ha/broker/submonitors/mem_load.py +++ b/ovirt_hosted_engine_ha/broker/submonitors/mem_load.py @@ -31,7 +31,7 @@ class Submonitor(submonitor_base.SubmonitorBase): def setup(self, options): - self._log = logging.getLogger("MemLoad") + self._log = logging.getLogger("%s.MemLoad" % (__name__)) self._log.addFilter(log_filter.IntermittentFilter()) self._address = options.get('address') self._use_ssl = util.to_bool(options.get('use_ssl')) diff --git a/ovirt_hosted_engine_ha/broker/submonitors/mgmt_bridge.py b/ovirt_hosted_engine_ha/broker/submonitors/mgmt_bridge.py index bbb29b0..a71b9e0 100644 --- a/ovirt_hosted_engine_ha/broker/submonitors/mgmt_bridge.py +++ b/ovirt_hosted_engine_ha/broker/submonitors/mgmt_bridge.py @@ -31,7 +31,7 @@ class Submonitor(submonitor_base.SubmonitorBase): def setup(self, options): - self._log = logging.getLogger("MgmtBridge") + self._log = logging.getLogger("%s.MgmtBridge" % (__name__)) self._log.addFilter(log_filter.IntermittentFilter()) self._address = options.get('address') self._use_ssl = util.to_bool(options.get('use_ssl')) diff --git a/ovirt_hosted_engine_ha/broker/submonitors/ping.py b/ovirt_hosted_engine_ha/broker/submonitors/ping.py index 3b9f140..370d107 100644 --- a/ovirt_hosted_engine_ha/broker/submonitors/ping.py +++ b/ovirt_hosted_engine_ha/broker/submonitors/ping.py @@ -31,7 +31,7 @@ class Submonitor(submonitor_base.SubmonitorBase): def setup(self, options): - self._log = logging.getLogger("Ping") + self._log = logging.getLogger("%s.Ping" % (__name__)) self._log.addFilter(log_filter.IntermittentFilter()) self._addr = options.get('addr') self._timeout = str(options.get('timeout', 10)) diff --git a/ovirt_hosted_engine_ha/broker/test/test_monitor.py b/ovirt_hosted_engine_ha/broker/test/test_monitor.py index 047be2e..4fe8e1d 100644 --- a/ovirt_hosted_engine_ha/broker/test/test_monitor.py +++ b/ovirt_hosted_engine_ha/broker/test/test_monitor.py @@ -25,7 +25,7 @@ def main(): logging.basicConfig(filename='/dev/stdout', filemode='w+', level=logging.DEBUG) - log = logging.getLogger("monitor test") + log = logging.getLogger("%s.monitor test" % (__name__)) log.warn("Could not init proper logging", exc_info=True) m = broker.monitor.Monitor() diff --git a/ovirt_hosted_engine_ha/client/client.py b/ovirt_hosted_engine_ha/client/client.py index bffd75c..f472261 100644 --- a/ovirt_hosted_engine_ha/client/client.py +++ b/ovirt_hosted_engine_ha/client/client.py @@ -68,7 +68,7 @@ if not log: logging.basicConfig(filename='/dev/null', filemode='w+', level=logging.CRITICAL) - self._log = logging.getLogger("HAClient") + self._log = logging.getLogger("%s.HAClient" % (__name__)) self._config = None def get_all_stats(self, mode=StatModes.ALL): diff --git a/ovirt_hosted_engine_ha/lib/brokerlink.py b/ovirt_hosted_engine_ha/lib/brokerlink.py index 8cfb795..a617eb5 100644 --- a/ovirt_hosted_engine_ha/lib/brokerlink.py +++ b/ovirt_hosted_engine_ha/lib/brokerlink.py @@ -35,7 +35,7 @@ class BrokerLink(object): def __init__(self): - self._log = logging.getLogger("BrokerLink") + self._log = logging.getLogger("%s.BrokerLink" % (__name__)) self._socket = None def connect(self, retries=0): -- To view, visit http://gerrit.ovirt.org/22371 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I40fb7aca813800dd445e858406034736817cac9c Gerrit-PatchSet: 1 Gerrit-Project: ovirt-hosted-engine-ha Gerrit-Branch: master Gerrit-Owner: Jiří Moskovčák <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
