diff options
author | Steve Baker <sbaker@redhat.com> | 2015-11-16 16:39:30 +1300 |
---|---|---|
committer | Steve Baker <sbaker@redhat.com> | 2015-11-16 16:39:30 +1300 |
commit | 508aa1ab1aee38f5e38ff457b869c44fa6ee52a3 (patch) | |
tree | 5e2dd1b7b6cea7361c459680293ab51f13f71803 /heatclient/common | |
parent | 5aeaf3d57bf8dae3acefe605486b6d8afaeed738 (diff) | |
download | python-heatclient-508aa1ab1aee38f5e38ff457b869c44fa6ee52a3.tar.gz |
Refine event_log_formatter output
- Fix timestamp printing so that date is first, and time doesn't have
truncated seconds
- Remove event UUID from output since it is of limited usefulness and
causes clutter
Change-Id: I646be059546289b4131956ba050ec1f1f74ab3b9
Closes-Bug: #1516481
Diffstat (limited to 'heatclient/common')
-rw-r--r-- | heatclient/common/utils.py | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/heatclient/common/utils.py b/heatclient/common/utils.py index 5a6efc8..524585f 100644 --- a/heatclient/common/utils.py +++ b/heatclient/common/utils.py @@ -100,20 +100,12 @@ def print_dict(d, formatters=None): def event_log_formatter(events): """Return the events in log format.""" event_log = [] - log_format = _("%(event_date)s %(event_time)s %(event_id)s " - "[%(rsrc_name)s]: %(rsrc_status)s %(rsrc_status_reason)s") + log_format = ("%(event_time)s " + "[%(rsrc_name)s]: %(rsrc_status)s %(rsrc_status_reason)s") for event in events: event_time = getattr(event, 'event_time', '') - time_date = event_time.split('T') - try: - event_date = time_date[0] - event_time = time_date[1] - except IndexError: - event_time = event_date = '' - log = log_format % { - 'event_date': event_date, 'event_time': event_time, - 'event_id': getattr(event, 'id', ''), + 'event_time': event_time.replace('T', ' '), 'rsrc_name': getattr(event, 'resource_name', ''), 'rsrc_status': getattr(event, 'resource_status', ''), 'rsrc_status_reason': getattr(event, 'resource_status_reason', '') |