wip

big_tests/tests/mod_event_pusher_rabbit_SUITE.erl

@@ -44,7 +44,7 @@
 -define(CHAT_MSG_RECV_TOPIC, <<"custom_chat_msg_recv_topic">>).
 -define(GROUP_CHAT_MSG_SENT_TOPIC, <<"custom_group_chat_msg_sent_topic">>).
 -define(GROUP_CHAT_MSG_RECV_TOPIC, <<"custom_group_chat_msg_recv_topic">>).
--define(WPOOL_CFG, #{scope => host_type,
+-define(WPOOL_CFG, #{tag => event_pusher, scope => host_type,
                      opts => #{workers => 20, strategy => best_worker, call_timeout => 5000}}).
 -define(IF_EXCHANGE_EXISTS_RETRIES, 30).
 -define(WAIT_FOR_EXCHANGE_INTERVAL, 100). % ms
@@ -614,7 +614,7 @@ start_rabbit_wpool(Host) ->
 
 start_rabbit_wpool(Host, WpoolConfig) ->
     rpc(mim(), mongoose_wpool, ensure_started, []),
-    Pool = config([outgoing_pools, rabbit, event_pusher], WpoolConfig),
+    Pool = config([outgoing_pools, rabbit], WpoolConfig),
     [{ok, _Pid}] = rpc(mim(), mongoose_wpool, start_configured_pools, [[Pool], [Host]]).
 
 stop_rabbit_wpool({Pool, Host, Tag}) ->

big_tests/tests/push_http_SUITE.erl

@@ -170,8 +170,8 @@ check_default_format(From, To, Body, Msg) ->
 start_pool() ->
     PoolOpts = #{strategy => random_worker, call_timeout => 5000, workers => 10},
     ConnOpts = #{host => http_notifications_host(), request_timeout => 5000},
-    Pool = config([outgoing_pools, http, http_pool],
-                  #{scope => host_type, opts => PoolOpts, conn_opts => ConnOpts}),
+    Pool = config([outgoing_pools, http],
+                  #{tag => http_pool, scope => host_type, opts => PoolOpts, conn_opts => ConnOpts}),
     [{ok, _Pid}] = rpc(mongoose_wpool, start_configured_pools, [[Pool], [<<"localhost">>]]).
 
 stop_pool() ->

src/config/mongoose_config_spec.erl

@@ -445,6 +445,7 @@ outgoing_pools() ->
                             || PoolType <- PoolTypes]),
     #section{
        items = Items,
+       process = fun mongoose_wpool:verify_unique_pools/1,
        wrap = global_config,
        format_items = list
       }.

src/wpool/mongoose_wpool.erl

@@ -31,6 +31,7 @@
 -export([is_configured/1]).
 -export([make_pool_name/3]).
 -export([call_start_callback/2]).
+-export([verify_unique_pools/1]).
 
 %% Mostly for tests
 -export([expand_pools/2]).
@@ -89,6 +90,26 @@
 
 -optional_callbacks([is_supported_strategy/1]).
 
+%% @doc Verify that all outgoing_pools have unique type, tag and scope
+-spec verify_unique_pools([pool_map_in()]) -> [pool_map()].
+verify_unique_pools(Pools) ->
+    PoolKeys = lists:map(fun pool_id/1, Pools),
+    case {lists:usort(PoolKeys), lists:sort(PoolKeys)} of
+        {SortedPool, SortedPool} -> Pools;
+        {Uniques, ContainsDuplicates} ->
+            Dups = lists:subtract(ContainsDuplicates, Uniques),
+            error(#{what => duplicate_pools, duplicates => Dups,
+                            text => <<"Some pools are duplicated">>})
+    end.
+
+
+%% @doc Create a unique ID based on the configuration identifiers
+-spec pool_id(pool_map_in()) -> {scope(), pool_type(), tag()}.
+pool_id(#{scope := HostType, type := Type, tag := Tag}) when is_binary(HostType) ->
+    {host_type, Type, Tag};
+pool_id(#{scope := Scope, type := Type, tag := Tag}) ->
+    {Scope, Type, Tag}.
+
 ensure_started() ->
     wpool:start(),
     case whereis(mongoose_wpool_sup) of

test/common/config_parser_helper.erl

@@ -784,7 +784,7 @@ default_pool_wpool_opts(_) ->
     default_wpool_opts().
 
 default_wpool_opts() ->
-     #{workers => 10,
+    #{workers => 10,
       strategy => best_worker,
       call_timeout => 5000}.