From 4fb0b5a09b26135ade285844da5d7dfe582a8d4c Mon Sep 17 00:00:00 2001
From: Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com>
Date: Thu, 18 May 2017 19:58:02 +0200
Subject: Import patches-unapplied version 2.2.12-0ubuntu1 to
 ubuntu/artful-proposed

Imported using git-ubuntu import.

Changelog parent: 473ad6fbfe0b9c3b362b530492928303f2b4c7f3

New changelog entries:
  * New upstream release (LP: #1690854).
    - Refreshed debian/patches/disable_import_test.patch.
---
 azurelinuxagent/common/event.py | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

(limited to 'azurelinuxagent/common/event.py')

diff --git a/azurelinuxagent/common/event.py b/azurelinuxagent/common/event.py
index ce79adf..116478b 100644
--- a/azurelinuxagent/common/event.py
+++ b/azurelinuxagent/common/event.py
@@ -24,7 +24,11 @@ import time
 import datetime
 import threading
 import platform
+
+from datetime import datetime
+
 import azurelinuxagent.common.logger as logger
+
 from azurelinuxagent.common.exception import EventError, ProtocolError
 from azurelinuxagent.common.future import ustr
 from azurelinuxagent.common.protocol.restapi import TelemetryEventParam, \
@@ -45,6 +49,7 @@ class WALAEventOperation:
     HeartBeat = "HeartBeat"
     Install = "Install"
     InitializeHostPlugin = "InitializeHostPlugin"
+    ProcessGoalState = "ProcessGoalState"
     Provision = "Provision"
     ReportStatus = "ReportStatus"
     Restart = "Restart"
@@ -111,6 +116,11 @@ class EventLogger(object):
 __event_logger__ = EventLogger()
 
 
+def elapsed_milliseconds(utc_start):
+    d = datetime.utcnow() - utc_start
+    return int(((d.days * 24 * 60 * 60 + d.seconds) * 1000) + \
+                    (d.microseconds / 1000.0))
+
 def report_event(op, is_success=True, message=''):
     from azurelinuxagent.common.version import AGENT_NAME, CURRENT_VERSION
     add_event(AGENT_NAME,
@@ -121,10 +131,11 @@ def report_event(op, is_success=True, message=''):
 
 
 def add_event(name, op="", is_success=True, duration=0, version=CURRENT_VERSION,
-              message="", evt_type="", is_internal=False,
+              message="", evt_type="", is_internal=False, log_event=True,
               reporter=__event_logger__):
-    log = logger.info if is_success else logger.error
-    log("Event: name={0}, op={1}, message={2}", name, op, message)
+    if log_event or not is_success:
+        log = logger.info if is_success else logger.error
+        log("Event: name={0}, op={1}, message={2}", name, op, message)
 
     if reporter.event_dir is None:
         logger.warn("Event reporter is not initialized.")
-- 
cgit v1.2.3