Make pool_name configurable for service_domain_db

esl · Aug 2, 2021 · 2b251e9 · 2b251e9
1 parent 9557370
commit 2b251e9
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 2 deletions.
diff --git a/doc/developers-guide/domain_management.md b/doc/developers-guide/domain_management.md
@@ -101,6 +101,21 @@ Configure host-type first to delete such domains.
 
 ## Service options
 
+```toml
+[services.service_domain_db]
+  pool_name = "global"
+  event_cleaning_interval = 1800
+  event_max_age = 7200
+```
+
+### `pool_name`
+
+Pool name to use for a database connection.
+
+* **Syntax:** atom
+* **Default:** `global`
+* **Example:** `pool_name = "global"`
+
 ### `event_cleaning_interval`
 
 The number of seconds between cleaning attempts of the `domain_events` table.

diff --git a/src/domain/mongoose_domain_sql.erl b/src/domain/mongoose_domain_sql.erl
@@ -258,7 +258,10 @@ row_to_map({HostType, Enabled}) ->
     #{host_type => HostType, enabled => mongoose_rdbms:to_bool(Enabled)}.
 
 get_db_pool() ->
-    hd(ejabberd_config:get_global_option(hosts)).
+    proplists:get_value(pool_name, get_service_opts(), global).
+
+get_service_opts() ->
+    mongoose_service:get_service_opts(service_domain_db).
 
 transaction(F) ->
     Pool = get_db_pool(),

diff --git a/src/domain/service_domain_db.erl b/src/domain/service_domain_db.erl
@@ -53,7 +53,9 @@ config_spec() ->
                <<"event_cleaning_interval">> => #option{type = integer,
                                                         validate = positive},
                <<"event_max_age">> => #option{type = integer,
-                                              validate = positive}
+                                              validate = positive},
+               <<"pool_name">> => #option{type = atom,
+                                          validate = pool_name}
               }}.
 
 start_link() ->