From d885152bedbdd289f7d6a3d24ab875fd4393bdff Mon Sep 17 00:00:00 2001 From: Łukasz 'sil2100' Zemczak Date: Thu, 15 Feb 2018 14:28:59 +0100 Subject: Import patches-unapplied version 2.2.21+really2.2.20-0ubuntu1~16.04.1 to ubuntu/xenial-proposed Imported using git-ubuntu import. Changelog parent: bdfe3a4fa9bd487ec5f40e829742e127476d2c8a New changelog entries: * Backport bionic version to xenial. * Revert to an older upstream release: 2.2.20 (LP: #1749589). - Rename upstream tarball to 2.2.21+really2.2.20 to end up with a temporarily higher version number than what's in the archive. * debian/patches/disable_import_test.patch: refreshed patch. --- azurelinuxagent/ga/monitor.py | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) (limited to 'azurelinuxagent/ga/monitor.py') diff --git a/azurelinuxagent/ga/monitor.py b/azurelinuxagent/ga/monitor.py index 71ac9b0..e3ef292 100644 --- a/azurelinuxagent/ga/monitor.py +++ b/azurelinuxagent/ga/monitor.py @@ -203,31 +203,26 @@ class MonitorHandler(object): version=CURRENT_VERSION, op=WALAEventOperation.HeartBeat, is_success=True, - message=msg, - log_event=False) + message=msg) counter += 1 - io_errors = IOErrorCounter.get_and_reset() - hostplugin_errors = io_errors.get("hostplugin") - protocol_errors = io_errors.get("protocol") - other_errors = io_errors.get("other") + ioerrors = IOErrorCounter.get_and_reset() + hostplugin_errors = ioerrors.get("hostplugin") + protocol_errors = ioerrors.get("protocol") + other_errors = ioerrors.get("other") - if hostplugin_errors > 0 \ - or protocol_errors > 0 \ - or other_errors > 0: - - msg = "hostplugin:{0};protocol:{1};other:{2}"\ - .format(hostplugin_errors, - protocol_errors, - other_errors) + if hostplugin_errors > 0 or \ + protocol_errors > 0 or \ + other_errors > 0: + msg = "hostplugin:{0};protocol:{1};other:{2}".format( + hostplugin_errors, protocol_errors, other_errors) add_event( name=AGENT_NAME, version=CURRENT_VERSION, op=WALAEventOperation.HttpErrors, - is_success=True, - message=msg, - log_event=False) + is_success=False, + msg=msg) try: self.collect_and_send_events() -- cgit v1.2.3