Make outgoing_pools a list

esl · Feb 29, 2024 · a3a8819 · a3a8819
1 parent cf1aaa2
commit a3a8819
Show file tree

Hide file tree

Showing 13 changed files with 195 additions and 148 deletions.
diff --git a/big_tests/test.config b/big_tests/test.config
@@ -236,7 +236,8 @@
     {internal_mnesia,
      %% dbs variable is used by ./tools/test_runner/presets_to_dbs.sh script
      [{dbs, [redis, minio]},
-      {outgoing_pools, "[outgoing_pools.redis.global_distrib]
+      {outgoing_pools, "[[outgoing_pools.redis]]
+  tag = \"global_distrib\"
   scope = \"global\"
   workers = 10"}]},
     {pgsql_cets,
@@ -250,10 +251,12 @@
       {auth_method, "rdbms"},
       {internal_databases, "[internal_databases.cets]
   cluster_name = \"{{cluster_name}}\""},
-      {outgoing_pools, "[outgoing_pools.redis.global_distrib]
+      {outgoing_pools, "[[outgoing_pools.redis]]
+  tag = \"global_distrib\"
   scope = \"global\"
   workers = 10
-[outgoing_pools.rdbms.default]
+[[outgoing_pools.rdbms]]
+  tag = \"default\"
   scope = \"global\"
   workers = 5
   connection.driver = \"pgsql\"
@@ -271,10 +274,12 @@
     {pgsql_mnesia,
      [{dbs, [redis, pgsql]},
       {auth_method, "rdbms"},
-      {outgoing_pools, "[outgoing_pools.redis.global_distrib]
+      {outgoing_pools, "[[outgoing_pools.redis]]
+  tag = \"global_distrib\"
   scope = \"global\"
   workers = 10
-[outgoing_pools.rdbms.default]
+[[outgoing_pools.rdbms]]
+  tag = \"default\"
   scope = \"global\"
   workers = 5
   connection.driver = \"pgsql\"
@@ -293,10 +298,12 @@
      [{dbs, [redis, mssql]},
       {auth_method, "rdbms"},
       {rdbms_server_type, "\"mssql\""},
-      {outgoing_pools, "[outgoing_pools.redis.global_distrib]
+      {outgoing_pools, "[[outgoing_pools.redis]]
+  tag = \"global_distrib\"
   scope = \"global\"
   workers = 10
-[outgoing_pools.rdbms.default]
+[[outgoing_pools.rdbms]]
+  tag = \"default\"
   scope = \"global\"
   workers = 5
   connection.driver = \"odbc\"
@@ -309,14 +316,17 @@
      [{dbs, [redis, mysql, rmq]},
       {sm_backend, "\"redis\""},
       {auth_method, "rdbms"},
-      {outgoing_pools, "[outgoing_pools.redis.global_distrib]
+      {outgoing_pools, "[[outgoing_pools.redis]]
+  tag = \"global_distrib\"
   scope = \"global\"
   workers = 10
-[outgoing_pools.redis.default]
+[[outgoing_pools.redis]]
+  tag = \"default\"
   scope = \"global\"
   workers = 10
   strategy = \"random_worker\"
-[outgoing_pools.rdbms.default]
+[[outgoing_pools.rdbms]]
+  tag = \"default\"
   scope = \"global\"
   workers = 5
   connection.driver = \"mysql\"
@@ -333,10 +343,12 @@
     {ldap_mnesia,
      [{dbs, [redis, ldap]},
       {auth_method, "ldap"},
-      {outgoing_pools, "[outgoing_pools.redis.global_distrib]
+      {outgoing_pools, "[[outgoing_pools.redis]]
+  tag = \"global_distrib\"
   scope = \"global\"
   workers = 10
-[outgoing_pools.ldap.default]
+[[outgoing_pools.ldap]]
+  tag = \"default\"
   scope = \"global\"
   workers = 5
   connection.port = 3636
@@ -346,7 +358,8 @@
   connection.tls.cacertfile = \"priv/ssl/cacert.pem\"
   connection.tls.certfile = \"priv/ssl/fake_cert.pem\"
   connection.tls.keyfile = \"priv/ssl/fake_key.pem\"
-[outgoing_pools.ldap.bind]
+[[outgoing_pools.ldap]]
+  tag = \"bind\"
   scope = \"global\"
   workers = 5
   connection.port = 3636
@@ -363,15 +376,18 @@
   ldap.filter = \"(objectClass=inetOrgPerson)\"\n"}]},
     {elasticsearch_and_cassandra_mnesia,
      [{dbs, [redis, elasticsearch, cassandra]},
-      {outgoing_pools, "[outgoing_pools.redis.global_distrib]
+      {outgoing_pools, "[[outgoing_pools.redis]]
+  tag = \"global_distrib\"
   scope = \"global\"
   workers = 10
-[outgoing_pools.cassandra.default]
+[[outgoing_pools.cassandra]]
+  tag = \"default\"
   scope = \"global\"
   workers = 20
   connection.servers = [{host = \"localhost\", port = 9142}]
   connection.tls.cacertfile = \"priv/ssl/cacert.pem\"
-[outgoing_pools.elastic.default]
+[[outgoing_pools.elastic]]
+  tag = \"default\"
   scope = \"global\""}
      ]}
    ]}

diff --git a/big_tests/tests/mod_event_pusher_http_SUITE.erl b/big_tests/tests/mod_event_pusher_http_SUITE.erl
@@ -170,7 +170,7 @@ get_prefix(Config) ->
 start_pool() ->
     PoolOpts = #{strategy => available_worker, workers => 5},
     ConnOpts = #{host => http_notifications_host(), request_timeout => 2000},
-    Pool = config([outgoing_pools, http, http_pool], #{opts => PoolOpts, conn_opts => ConnOpts}),
+    Pool = config([aoutgoing_pools, http], #{tag => http_pool, opts => PoolOpts, conn_opts => ConnOpts}),
     [{ok, _Pid}] = rpc(mim(), mongoose_wpool, start_configured_pools, [[Pool]]).
 
 stop_pool() ->

diff --git a/big_tests/tests/muc_SUITE.erl b/big_tests/tests/muc_SUITE.erl
@@ -378,8 +378,8 @@ init_per_group(G, Config) when G =:= http_auth_no_server;
     PoolOpts = #{strategy => available_worker, workers => 5},
     ConnOpts = #{host => "http://localhost:8080", path_prefix => <<"/muc/auth/">>,
                  request_timeout => 2000},
-    Pool = config([outgoing_pools, http, muc_http_auth_test],
-                  #{opts => PoolOpts, conn_opts => ConnOpts}),
+    Pool = config([outgoing_pools, http],
+                  #{tag => muc_http_auth_test, opts => PoolOpts, conn_opts => ConnOpts}),
     [{ok, _Pid}] = rpc(mim(), mongoose_wpool, start_configured_pools, [[Pool]]),
     case G of
         http_auth -> http_helper:start(8080, "/muc/auth/check_password", fun handle_http_auth/1);

diff --git a/big_tests/tests/push_integration_SUITE.erl b/big_tests/tests/push_integration_SUITE.erl
@@ -135,7 +135,7 @@ init_per_suite(Config) ->
     PoolOpts = #{strategy => available_worker, workers => 20},
     ConnOpts = #{host => "https://localhost:" ++ integer_to_list(Port), request_timeout => 2000,
                  tls => #{verify_mode => none}},
-    Pool = config([outgoing_pools, http, mongoose_push_http], #{opts => PoolOpts, conn_opts => ConnOpts}),
+    Pool = config([outgoing_pools, http], #{tag => mongoose_push_http, opts => PoolOpts, conn_opts => ConnOpts}),
     [{ok, _Pid}] = rpc(?RPC_SPEC, mongoose_wpool, start_configured_pools, [[Pool]]),
     ConfigWithModules = dynamic_modules:save_modules(domain(), Config),
     escalus:init_per_suite(ConfigWithModules).

diff --git a/big_tests/tests/push_pubsub_SUITE.erl b/big_tests/tests/push_pubsub_SUITE.erl
@@ -78,8 +78,8 @@ init_per_testcase(CaseName, Config) ->
     PoolOpts = #{strategy => available_worker, workers => 20},
     ConnOpts = #{host => "http://localhost:" ++ integer_to_list(MongoosePushMockPort),
                  request_timeout => 2000},
-    Pool = config([outgoing_pools, http, mongoose_push_http],
-                  #{opts => PoolOpts, conn_opts => ConnOpts}),
+    Pool = config([outgoing_pools, http],
+                  #{tag => mongoose_push_http, opts => PoolOpts, conn_opts => ConnOpts}),
     [{ok, _Pid}] = rpc(mongoose_wpool, start_configured_pools, [[Pool]]),
     escalus:init_per_testcase(CaseName, Config).