Skip to content

Commit

Permalink
Merge pull request RedisLabs#136 from RedisLabs/nick/make-log-collect…
Browse files Browse the repository at this point in the history
…or-failures-non-fatal

make log_collector - esp. on windows - more tolerant of errors
  • Loading branch information
yuvallevy2 authored Sep 1, 2020
2 parents a24d02d + 1ade2f4 commit 796ad11
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion log_collector/log_collector.py
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,7 @@ def run_shell_command_regular(args):
except subprocess.CalledProcessError as ex:
logger.warning("Failed in shell command: %s, output: %s",
args, ex.output)
return ex.returncode, ex.output
return ex.returncode, native_string(ex.output)

return 0, native_string(output)

Expand Down

0 comments on commit 796ad11

Please sign in to comment.