Ditto for prematurely [but explicitly] closed client TCP connections

Author: michaelklishin

src/rabbit_reader.erl

@@ -422,6 +422,7 @@ start_connection(Parent, HelperSup, Deb, Sock) ->
 log_connection_exception(Name, Ex) ->
     Severity = case Ex of
                    connection_closed_with_no_data_received -> debug;
+                   {connection_closed_abruptly, _}         -> warning;
                    connection_closed_abruptly              -> warning;
                    _                                       -> error
                end,
@@ -431,6 +432,17 @@ log_connection_exception(Severity, Name, {heartbeat_timeout, TimeoutSec}) ->
     %% Long line to avoid extra spaces and line breaks in log
     log(Severity, "closing AMQP connection ~p (~s):~nmissed heartbeats from client, timeout: ~ps~n",
         [self(), Name, TimeoutSec]);
+log_connection_exception(Severity, Name, {connection_closed_abruptly,
+                                          #v1{connection = #connection{user  = #user{username = Username},
+                                                                       vhost = VHost}}}) ->
+    log(Severity, "closing AMQP connection ~p (~s, vhost: '~s', user: '~s'):~nclient unexpectedly closed TCP connection~n",
+        [self(), Name, VHost, Username]);
+%% when client abruptly closes connection before connection.open/authentication/authorization
+%% succeeded, don't log username and vhost as 'none'
+log_connection_exception(Severity, Name, {connection_closed_abruptly, _}) ->
+    log(Severity, "closing AMQP connection ~p (~s):~nclient unexpectedly closed TCP connection~n",
+        [self(), Name]);
+%% old exception structure
 log_connection_exception(Severity, Name, connection_closed_abruptly) ->
     log(Severity, "closing AMQP connection ~p (~s):~nclient unexpectedly closed TCP connection~n",
         [self(), Name]);
@@ -528,7 +540,7 @@ stop(tcp_healthcheck, State) ->
     throw(connection_closed_with_no_data_received);
 stop(closed, State) ->
     maybe_emit_stats(State),
-    throw(connection_closed_abruptly);
+    throw({connection_closed_abruptly, State});
 stop(Reason, State) ->
     maybe_emit_stats(State),
     throw({inet_error, Reason}).
@@ -1138,7 +1150,7 @@ handle_method0(MethodName, FieldsBin,
                        State)
     catch throw:{inet_error, E} when E =:= closed; E =:= enotconn ->
             maybe_emit_stats(State),
-            throw(connection_closed_abruptly);
+            throw({connection_closed_abruptly, State});
           exit:#amqp_error{method = none} = Reason ->
             handle_exception(State, 0, Reason#amqp_error{method = MethodName});
           Type:Reason ->