diff options
| author | Hans Nilsson <[email protected]> | 2019-08-19 15:15:04 +0200 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2019-08-19 15:15:04 +0200 |
| commit | 6427b430346287bea468d896af4a6c8ca5948284 (patch) | |
| tree | 3900712940c83bec08edf58952e108dc04e17415 /lib/ssh | |
| parent | 38dca4fde652fd8b521edfc0fae876fb56eaadcb (diff) | |
| parent | a5109cf75597c347146b2ee0e09474b94ba00677 (diff) | |
| download | otp-6427b430346287bea468d896af4a6c8ca5948284.tar.gz otp-6427b430346287bea468d896af4a6c8ca5948284.tar.bz2 otp-6427b430346287bea468d896af4a6c8ca5948284.zip | |
Merge branch 'maint'
* maint:
ssh: Don't assume Reason to be a string()
Diffstat (limited to 'lib/ssh')
| -rw-r--r-- | lib/ssh/src/ssh_connection_handler.erl | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/ssh/src/ssh_connection_handler.erl b/lib/ssh/src/ssh_connection_handler.erl index 9df4f1e2d7..4e9ade327b 100644 --- a/lib/ssh/src/ssh_connection_handler.erl +++ b/lib/ssh/src/ssh_connection_handler.erl @@ -2040,7 +2040,13 @@ log(Tag, D, Reason) -> end. -do_log(F, Reason, #data{ssh_params = S}) -> +do_log(F, Reason0, #data{ssh_params = S}) -> + Reason = + try io_lib:format("~s",[Reason0]) + of _ -> Reason0 + catch + _:_ -> io_lib:format("~p",[Reason0]) + end, case S of #ssh{role = Role} when Role==server ; Role==client -> |