valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

show duration in seconds instead of milliseconds when appropriate

Browse Source
This commit is contained in:
Andreas Lutro 2015-07-22 20:15:52 +02:00
parent 40e9b07736
commit 4fd4a0c0ff
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
salt/output/highstate.py
View File

@ -368,7 +368,15 @@ def _format_host(host, data):
sum(six.itervalues(rcounts)) - rcounts.get('warnings', 0),
line_max_len - 7)
hstrs.append(colorfmt.format(colors['CYAN'], totals, colors))
total_duration = u'Total run time: {0:>{1}} ms'.format(sum(rdurations), line_max_len - 7)
sum_duration = sum(rdurations)
duration_unit = 'ms'
# convert to seconds if duration is 1000ms or more
if sum_duration > 999:
sum_duration /= 1000
duration_unit = 's'
total_duration = u'Total run time: {0:>{1}} {2}'.format(
sum_duration, line_max_len - 7, duration_unit)
hstrs.append(colorfmt.format(colors['CYAN'], total_duration, colors))
if strip_colors: