Skip to content

Commit c666803

Browse files
committed
Scrub connection limits from public API health checks
1 parent 8805cdd commit c666803

File tree

3 files changed

+4
-13
lines changed

3 files changed

+4
-13
lines changed

deps/rabbitmq_management/src/rabbit_mgmt_wm_health_check_below_node_connection_limit.erl

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,11 @@ to_json(ReqData, Context) ->
3434
Limit = rabbit_misc:get_env(rabbit, connection_max, infinity),
3535
case ActiveConns < Limit of
3636
true ->
37-
rabbit_mgmt_util:reply(
38-
#{status => ok,
39-
limit => Limit,
40-
connections => ActiveConns}, ReqData, Context);
37+
rabbit_mgmt_util:reply(#{status => ok}, ReqData, Context);
4138
false ->
4239
Body = #{
4340
status => failed,
4441
reason => <<"node connection limit is reached">>,
45-
limit => Limit,
4642
connections => ActiveConns
4743
},
4844
{Response, ReqData1, Context1} = rabbit_mgmt_util:reply(

deps/rabbitmq_management/src/rabbit_mgmt_wm_health_check_ready_to_serve_clients.erl

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ content_types_provided(ReqData, Context) ->
3333

3434
to_json(ReqData, Context) ->
3535
case check() of
36-
{ok, Body} ->
37-
rabbit_mgmt_util:reply(Body, ReqData, Context);
36+
ok ->
37+
rabbit_mgmt_util:reply(#{status => ok}, ReqData, Context);
3838
{error, Body} ->
3939
{Response, ReqData1, Context1} = rabbit_mgmt_util:reply(
4040
Body, ReqData, Context),
@@ -62,13 +62,10 @@ check() ->
6262
Limit = rabbit_misc:get_env(rabbit, connection_max, infinity),
6363
case ActiveConns < Limit of
6464
true ->
65-
{ok, #{status => ok,
66-
limit => Limit,
67-
connections => ActiveConns}};
65+
ok;
6866
false ->
6967
{error, #{status => failed,
7068
reason => <<"node connection limit is reached">>,
71-
limit => Limit,
7269
connections => ActiveConns}}
7370
end;
7471
[] ->

deps/rabbitmq_management/test/rabbit_mgmt_http_health_checks_SUITE.erl

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -489,7 +489,6 @@ below_node_connection_limit_test(Config) ->
489489

490490
Body0 = http_get_failed(Config, Path),
491491
?assertEqual(<<"failed">>, maps:get(<<"status">>, Body0)),
492-
?assertEqual(10, maps:get(<<"limit">>, Body0)),
493492
?assertEqual(10, maps:get(<<"connections">>, Body0)),
494493

495494
%% Clean up the connections and reset the limit.
@@ -519,7 +518,6 @@ ready_to_serve_clients_test(Config) ->
519518

520519
Body1 = http_get_failed(Config, Path),
521520
?assertEqual(<<"failed">>, maps:get(<<"status">>, Body1)),
522-
?assertEqual(10, maps:get(<<"limit">>, Body1)),
523521
?assertEqual(10, maps:get(<<"connections">>, Body1)),
524522

525523
%% Clean up the connections and reset the limit.

0 commit comments

Comments
 (0)