diff options
| author | Luke Bakken <lbakken@pivotal.io> | 2020-12-09 09:32:38 -0800 |
|---|---|---|
| committer | Luke Bakken <lbakken@pivotal.io> | 2020-12-10 08:36:14 -0800 |
| commit | 4917b52a2a1359abed7b10b3df8a024cdf3f6889 (patch) | |
| tree | f8bfa8f99edd7dfed8fa7161aa9bbb157d5a79f5 | |
| parent | f47bc68550986090b87e1c979f91d2a8c28e512f (diff) | |
| download | rabbitmq-server-git-rabbitmq-sni.tar.gz | |
Update logging and add custom SNI funrabbitmq-sni
| -rw-r--r-- | deps/rabbit/src/rabbit_reader.erl | 18 | ||||
| -rw-r--r-- | deps/rabbit_common/src/rabbit_misc.erl | 6 |
2 files changed, 15 insertions, 9 deletions
diff --git a/deps/rabbit/src/rabbit_reader.erl b/deps/rabbit/src/rabbit_reader.erl index 569071ab8a..ab9c5691bd 100644 --- a/deps/rabbit/src/rabbit_reader.erl +++ b/deps/rabbit/src/rabbit_reader.erl @@ -1572,15 +1572,15 @@ socket_info(Get, Select, #v1{sock = Sock}) -> end. sni_info(Sock) -> - case rabbit_net:ssl_info(Sock, [sni_hostname]) of - nossl -> ''; - {error, _} -> ''; - {ok, Items} -> - io:format("Items value: ~p\n", [Items]), - SNI = proplists:get_value(sni_hostname, Items), - io:format("SNI value: ~s\n", [SNI]), - SNI - end. + case rabbit_net:ssl_info(Sock, [sni_hostname]) of + nossl -> ''; + {error, _} -> ''; + {ok, Items} -> + rabbit_log:debug("@@@@@@@@ sni_info items value: ~p", [Items]), + SNI = proplists:get_value(sni_hostname, Items), + rabbit_log:debug("@@@@@@@@ sni_info SNI value: ~s", [SNI]), + SNI + end. ssl_info(F, #v1{sock = Sock}) -> case rabbit_net:ssl_info(Sock) of diff --git a/deps/rabbit_common/src/rabbit_misc.erl b/deps/rabbit_common/src/rabbit_misc.erl index c5fd86dcbb..2cab75477f 100644 --- a/deps/rabbit_common/src/rabbit_misc.erl +++ b/deps/rabbit_common/src/rabbit_misc.erl @@ -17,6 +17,8 @@ -export([decompose_pid/1, compose_pid/4]). -endif. +-export([lrb_sni_fun/1]). + -export([method_record_type/1, polite_pause/0, polite_pause/1]). -export([die/1, frame_error/2, amqp_error/4, quit/1, protocol_error/3, protocol_error/4, protocol_error/1]). @@ -261,6 +263,10 @@ %%---------------------------------------------------------------------------- +lrb_sni_fun(ServerName) -> + rabbit_log:debug("@@@@@@@@ sni_fun ServerName: ~p", [ServerName]), + []. + method_record_type(Record) -> element(1, Record). |