root
/
rabbitmq-server
mirror of https://github.com/rabbitmq/rabbitmq-server.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Do not quote connection duration 

It cannot contain spaces like username,
virtual host and user-provided connection
name can.
This commit is contained in:
Michael Klishin 2024-09-04 21:33:38 -04:00
parent 3440e374d0
commit 4299e1ddc3
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
deps/rabbit/src/rabbit_reader.erl vendored
View File

@ -366,13 +366,13 @@ start_connection(Parent, HelperSups, RanchRef, Deb, Sock) ->
connected_at = ConnectedAt0}} -> connected_at = ConnectedAt0}} ->
ConnName = dynamic_connection_name(Name), ConnName = dynamic_connection_name(Name),
ConnDuration = connection_duration(ConnectedAt0), ConnDuration = connection_duration(ConnectedAt0),
rabbit_log_connection:info("closing AMQP connection (~ts, vhost: '~ts', user: '~ts', duration: '~ts')", rabbit_log_connection:info("closing AMQP connection (~ts, vhost: '~ts', user: '~ts', duration: ~ts)",
[ConnName, VHost, Username, ConnDuration]); [ConnName, VHost, Username, ConnDuration]);
%% just to be more defensive %% just to be more defensive
_ -> _ ->
ConnName = dynamic_connection_name(Name), ConnName = dynamic_connection_name(Name),
ConnDuration = connection_duration(ConnectedAt), ConnDuration = connection_duration(ConnectedAt),
rabbit_log_connection:info("closing AMQP connection (~ts, duration: '~ts')", rabbit_log_connection:info("closing AMQP connection (~ts, duration: ~ts)",
[ConnName, ConnDuration]) [ConnName, ConnDuration])
end end
catch catch
@ -417,7 +417,7 @@ log_connection_exception(Name, ConnectedAt, Ex) ->
log_connection_exception(Severity, Name, ConnectedAt, {heartbeat_timeout, TimeoutSec}) -> log_connection_exception(Severity, Name, ConnectedAt, {heartbeat_timeout, TimeoutSec}) ->
ConnDuration = connection_duration(ConnectedAt), ConnDuration = connection_duration(ConnectedAt),
Fmt = "closing AMQP connection ~tp (~ts, duration: '~ts'):~n" Fmt = "closing AMQP connection ~tp (~ts, duration: ~ts):~n"
"missed heartbeats from client, timeout: ~ps", "missed heartbeats from client, timeout: ~ps",
%% Long line to avoid extra spaces and line breaks in log %% Long line to avoid extra spaces and line breaks in log
log_connection_exception_with_severity(Severity, Fmt, log_connection_exception_with_severity(Severity, Fmt,
@ -428,7 +428,7 @@ log_connection_exception(Severity, Name, _ConnectedAt,
vhost = VHost, vhost = VHost,
connected_at = ConnectedAt}}}) -> connected_at = ConnectedAt}}}) ->
ConnDuration = connection_duration(ConnectedAt), ConnDuration = connection_duration(ConnectedAt),
Fmt = "closing AMQP connection ~tp (~ts, vhost: '~ts', user: '~ts', duration: '~ts'):~n" Fmt = "closing AMQP connection ~tp (~ts, vhost: '~ts', user: '~ts', duration: ~ts):~n"
"client unexpectedly closed TCP connection", "client unexpectedly closed TCP connection",
log_connection_exception_with_severity(Severity, Fmt, log_connection_exception_with_severity(Severity, Fmt,
[self(), Name, VHost, Username, ConnDuration]); [self(), Name, VHost, Username, ConnDuration]);
@ -436,7 +436,7 @@ log_connection_exception(Severity, Name, _ConnectedAt,
%% succeeded, don't log username and vhost as 'none' %% succeeded, don't log username and vhost as 'none'
log_connection_exception(Severity, Name, ConnectedAt, {connection_closed_abruptly, _}) -> log_connection_exception(Severity, Name, ConnectedAt, {connection_closed_abruptly, _}) ->
ConnDuration = connection_duration(ConnectedAt), ConnDuration = connection_duration(ConnectedAt),
Fmt = "closing AMQP connection ~tp (~ts, duration: '~ts'):~n" Fmt = "closing AMQP connection ~tp (~ts, duration: ~ts):~n"
"client unexpectedly closed TCP connection", "client unexpectedly closed TCP connection",
log_connection_exception_with_severity(Severity, Fmt, log_connection_exception_with_severity(Severity, Fmt,
[self(), Name, ConnDuration]); [self(), Name, ConnDuration]);
@ -450,20 +450,20 @@ log_connection_exception(Severity, Name, ConnectedAt, {handshake_error, tuning,
log_connection_exception_with_severity(Severity, Fmt, [self(), Name, ConnDuration, Explanation]); log_connection_exception_with_severity(Severity, Fmt, [self(), Name, ConnDuration, Explanation]);
log_connection_exception(Severity, Name, ConnectedAt, {sasl_required, ProtocolId}) -> log_connection_exception(Severity, Name, ConnectedAt, {sasl_required, ProtocolId}) ->
ConnDuration = connection_duration(ConnectedAt), ConnDuration = connection_duration(ConnectedAt),
Fmt = "closing AMQP 1.0 connection (~ts, duration: '~ts'): RabbitMQ requires SASL " Fmt = "closing AMQP 1.0 connection (~ts, duration: ~ts): RabbitMQ requires SASL "
"security layer (expected protocol ID 3, but client sent protocol ID ~b)", "security layer (expected protocol ID 3, but client sent protocol ID ~b)",
log_connection_exception_with_severity(Severity, Fmt, log_connection_exception_with_severity(Severity, Fmt,
[Name, ConnDuration, ProtocolId]); [Name, ConnDuration, ProtocolId]);
%% old exception structure %% old exception structure
log_connection_exception(Severity, Name, ConnectedAt, connection_closed_abruptly) -> log_connection_exception(Severity, Name, ConnectedAt, connection_closed_abruptly) ->
ConnDuration = connection_duration(ConnectedAt), ConnDuration = connection_duration(ConnectedAt),
Fmt = "closing AMQP connection ~tp (~ts, duration: '~ts'):~n" Fmt = "closing AMQP connection ~tp (~ts, duration: ~ts):~n"
"client unexpectedly closed TCP connection", "client unexpectedly closed TCP connection",
log_connection_exception_with_severity(Severity, Fmt, log_connection_exception_with_severity(Severity, Fmt,
[self(), Name, ConnDuration]); [self(), Name, ConnDuration]);
log_connection_exception(Severity, Name, ConnectedAt, Ex) -> log_connection_exception(Severity, Name, ConnectedAt, Ex) ->
ConnDuration = connection_duration(ConnectedAt), ConnDuration = connection_duration(ConnectedAt),
Fmt = "closing AMQP connection ~tp (~ts, duration: '~ts'):~n" Fmt = "closing AMQP connection ~tp (~ts, duration: ~ts):~n"
"~tp", "~tp",
log_connection_exception_with_severity(Severity, Fmt, log_connection_exception_with_severity(Severity, Fmt,
[self(), Name, ConnDuration, Ex]). [self(), Name, ConnDuration, Ex]).