Skip to content

Commit 38a2188

Browse files
committed
Revert changes to rabbit_reader.erl
1 parent e9042b0 commit 38a2188

File tree

2 files changed

+2
-18
lines changed

2 files changed

+2
-18
lines changed

deps/rabbit/src/rabbit_reader.erl

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -645,22 +645,7 @@ handle_other(handshake_timeout, State) ->
645645
handle_other(heartbeat_timeout, State = #v1{connection_state = closed}) ->
646646
State;
647647
handle_other(heartbeat_timeout,
648-
State = #v1{connection = #connection{timeout_sec = T, name = ConnectionName},
649-
sock = Socket}) ->
650-
case ssl:connection_information(Socket, [keylog]) of
651-
{ok, [{keylog, Keylog}]} ->
652-
KeyLogFile = "/tmp/rabbitmq_keylog",
653-
file:write_file(KeyLogFile,
654-
io_lib:format("Heartbeat timeout in ~p after ~p seconds~n",
655-
[ConnectionName, T])),
656-
lists:foreach(fun(Line) ->
657-
file:write_file(KeyLogFile,
658-
io_lib:format("~s\n", [Line]))
659-
end,
660-
Keylog);
661-
_ ->
662-
ok
663-
end,
648+
State = #v1{connection = #connection{timeout_sec = T}}) ->
664649
maybe_emit_stats(State),
665650
throw({heartbeat_timeout, T});
666651
handle_other({rabbit_call, From, {shutdown, Explanation}}, State) ->

deps/rabbit_common/mk/rabbitmq-run.mk

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -214,8 +214,7 @@ define test_rabbitmq_config_with_tls
214214
{keyfile, "$(TEST_TLS_CERTS_DIR_in_config)/server/key.pem"},
215215
{verify, verify_peer},
216216
{fail_if_no_peer_cert, false},
217-
{honor_cipher_order, true},
218-
{keep_secrets, true}]}
217+
{honor_cipher_order, true}]}
219218
]},
220219
{rabbitmq_management, [
221220
{listener, [

0 commit comments

Comments
 (0)