saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #35271 from bobrik/default-output-profile

Browse source 
Default state_output_profile to True everywhere, closes #35166
This commit is contained in:
Mike Place 2016-08-08 23:36:23 +09:00 • committed by GitHub
commit 3e4eb13daa
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
salt/output/highstate.py
View file

@ -423,7 +423,7 @@ def _format_host(host, data):
line_max_len - 7)
hstrs.append(colorfmt.format(colors['CYAN'], totals, colors))
if __opts__.get('state_output_profile', False):
if __opts__.get('state_output_profile', True):
sum_duration = sum(rdurations)
duration_unit = 'ms'
# convert to seconds if duration is 1000ms or more
@ -491,14 +491,14 @@ def _format_terse(tcolor, comps, ret, colors, tabular):
result = u'Differs'
if tabular is True:
fmt_string = u'{0}'
if __opts__.get('state_output_profile', False):
if __opts__.get('state_output_profile', True):
fmt_string += u'{6[start_time]!s} [{6[duration]!s} ms] '
fmt_string += u'{2:>10}.{3:<10} {4:7} Name: {1}{5}'
elif isinstance(tabular, str):
fmt_string = tabular
else:
fmt_string = u' {0} Name: {1} - Function: {2}.{3} - Result: {4}'
if __opts__.get('state_output_profile', False):
if __opts__.get('state_output_profile', True):
fmt_string += u' Started: - {6[start_time]!s} Duration: {6[duration]!s} ms'
fmt_string += u'{5}'