aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorErlang/OTP <otp@erlang.org>2018-02-21 15:09:46 +0100
committerErlang/OTP <otp@erlang.org>2018-02-21 15:09:46 +0100
commita17e29513b992afe82d7cdfdd3c880158ad0d80a (patch)
tree7ef025d1f3ad10d13d941b186c16ef8018d849a1 /lib
parentd42ff869391cea3cec9224077f33cf33f58e41be (diff)
parente2ed1a9701cb83f4568ab17b8f0659803c57e988 (diff)
downloadotp-a17e29513b992afe82d7cdfdd3c880158ad0d80a.tar.gz
otp-a17e29513b992afe82d7cdfdd3c880158ad0d80a.tar.bz2
otp-a17e29513b992afe82d7cdfdd3c880158ad0d80a.zip
Merge branch 'hans/ssh/no_error_for_kill/OTP-14930' into maint-20
* hans/ssh/no_error_for_kill/OTP-14930: ssh: No error message for signal kill
Diffstat (limited to 'lib')
-rw-r--r--lib/ssh/src/ssh_connection_handler.erl7
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/ssh/src/ssh_connection_handler.erl b/lib/ssh/src/ssh_connection_handler.erl
index 0ca960ef96..c8ac3a9c04 100644
--- a/lib/ssh/src/ssh_connection_handler.erl
+++ b/lib/ssh/src/ssh_connection_handler.erl
@@ -1460,13 +1460,12 @@ terminate(shutdown, StateName, State0) ->
State0),
finalize_termination(StateName, State);
-%% terminate({shutdown,Msg}, StateName, State0) when is_record(Msg,ssh_msg_disconnect)->
-%% State = send_msg(Msg, State0),
-%% finalize_termination(StateName, Msg, State);
-
terminate({shutdown,_R}, StateName, State) ->
finalize_termination(StateName, State);
+terminate(kill, StateName, State) ->
+ finalize_termination(StateName, State);
+
terminate(Reason, StateName, State0) ->
%% Others, e.g undef, {badmatch,_}
log_error(Reason),