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

Support writing output to an open filehandle/file-like object

Browse Source
This commit is contained in:
Erik Johnson 2016-09-01 10:20:57 -05:00
parent f41db032a2
commit b3dfd95a6d
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
salt/output/__init__.py
View File

@ -12,13 +12,12 @@ import sys
import errno
import logging
import traceback
from salt.ext.six import string_types
# Import salt libs
import salt.loader
import salt.utils
from salt.utils import print_cli
import salt.ext.six as six
from salt.utils import print_cli
# Are you really sure !!!
# dealing with unicode is not as simple as setting defaultencoding
@ -96,7 +95,15 @@ def display_output(data, out=None, opts=None):
try:
# output filename can be either '' or None
if output_filename:
with salt.utils.fopen(output_filename, 'a') as ofh:
if not hasattr(output_filename, 'write'):
ofh = salt.utils.fopen(output_filename, 'a')
fh_opened = True
else:
# Filehandle/file-like object
ofh = output_filename
fh_opened = False
try:
fdata = display_data
if isinstance(fdata, six.text_type):
try:
@ -105,11 +112,15 @@ def display_output(data, out=None, opts=None):
# try to let the stream write
# even if we didn't encode it
pass
if six.PY3:
ofh.write(fdata.decode())
else:
ofh.write(fdata)
ofh.write('\n')
if fdata:
if six.PY3:
ofh.write(fdata.decode())
else:
ofh.write(fdata)
ofh.write('\n')
finally:
if fh_opened:
ofh.close()
return
if display_data:
print_cli(display_data)