diff options
Diffstat (limited to 'azurelinuxagent/event.py')
| -rw-r--r-- | azurelinuxagent/event.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/azurelinuxagent/event.py b/azurelinuxagent/event.py index f866a22..02e8017 100644 --- a/azurelinuxagent/event.py +++ b/azurelinuxagent/event.py @@ -82,9 +82,11 @@ class EventMonitor(object): def collect_event(self, evt_file_name): try: + logger.verb("Found event file: {0}", evt_file_name) with open(evt_file_name, "rb") as evt_file: #if fail to open or delete the file, throw exception json_str = evt_file.read().decode("utf-8",'ignore') + logger.verb("Processed event file: {0}", evt_file_name) os.remove(evt_file_name) return json_str except IOError as e: @@ -107,11 +109,11 @@ class EventMonitor(object): data = json.loads(data_str) except ValueError as e: logger.verb(data_str) - logger.error("Failed to decode json event file{0}", e) + logger.error("Failed to decode json event file: {0}", e) continue event = prot.TelemetryEvent() - prot.set_properties(event, data) + prot.set_properties("event", event, data) event.parameters.extend(self.sysinfo) event_list.events.append(event) if len(event_list.events) == 0: @@ -151,8 +153,10 @@ def save_event(data): except IOError as e: raise EventError("Failed to write events to file:{0}", e) -def add_event(name, op, is_success, duration=0, version="1.0", +def add_event(name, op="", is_success=True, duration=0, version="1.0", message="", evt_type="", is_internal=False): + log = logger.info if is_success else logger.error + log("Event: name={0}, op={1}, message={2}", name, op, message) event = prot.TelemetryEvent(1, "69B669B9-4AF8-4C50-BDC4-6006FA76E975") event.parameters.append(prot.TelemetryEventParam('Name', name)) event.parameters.append(prot.TelemetryEventParam('Version', version)) @@ -179,7 +183,6 @@ def dump_unhandled_err(name): error = traceback.format_exception(last_type, last_value, last_traceback) message= "".join(error) - logger.error(message) add_event(name, is_success=False, message=message, op=WALAEventOperation.UnhandledError) |