Merge pull request #15157 from amazon-mq/lukebakken/infinity-is-bad-mmmmkay

Remove the use of `infinity` in `rabbit_web_dispatch_registry`

Author: michaelklishin

deps/rabbit_common/include/rabbit.hrl

@@ -277,3 +277,5 @@
 %% Max value for stream max segment size
 -define(MAX_STREAM_MAX_SEGMENT_SIZE, 3_000_000_000).
 
+%% Preferred value instead of `infinity`
+-define(GEN_SERVER_CALL_TIMEOUT, 60000).

deps/rabbitmq_web_dispatch/src/rabbit_web_dispatch_registry.erl

@@ -8,7 +8,7 @@
 -module(rabbit_web_dispatch_registry).
 
 -include_lib("kernel/include/logger.hrl").
-
+-include_lib("rabbit_common/include/rabbit.hrl").
 
 -behaviour(gen_server).
 
@@ -30,10 +30,10 @@ start_link() ->
 
 add(Name, Listener, Selector, Handler, Link) ->
     gen_server:call(?MODULE, {add, Name, Listener, Selector, Handler, Link},
-                    infinity).
+                    ?GEN_SERVER_CALL_TIMEOUT).
 
 remove(Name) ->
-    gen_server:call(?MODULE, {remove, Name}, infinity).
+    gen_server:call(?MODULE, {remove, Name}, ?GEN_SERVER_CALL_TIMEOUT).
 
 %% @todo This needs to be dispatch instead of a fun too.
 %% But I'm not sure what code is using this.
@@ -56,7 +56,7 @@ lookup(Listener, Req) ->
 %% This is called in a somewhat obfuscated manner in
 %% rabbit_mgmt_external_stats:rabbit_web_dispatch_registry_list_all()
 list_all() ->
-    gen_server:call(?MODULE, list_all, infinity).
+    gen_server:call(?MODULE, list_all, ?GEN_SERVER_CALL_TIMEOUT).
 
 %% Callback Methods