From 85ab97970fb264ca42a38b5c142ac5c1a6a5be8b Mon Sep 17 00:00:00 2001 From: Paulo Zulato Date: Wed, 19 Jul 2023 14:43:49 -0300 Subject: [PATCH] fix(oracle): fix Pool Size parameter retrieval Fixes https://emqx.atlassian.net/browse/EMQX-10599 --- apps/emqx_bridge_oracle/test/emqx_bridge_oracle_SUITE.erl | 2 ++ apps/emqx_oracle/src/emqx_oracle.app.src | 2 +- apps/emqx_oracle/src/emqx_oracle.erl | 2 +- changes/ee/fix-11316.en.md | 1 + 4 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 changes/ee/fix-11316.en.md diff --git a/apps/emqx_bridge_oracle/test/emqx_bridge_oracle_SUITE.erl b/apps/emqx_bridge_oracle/test/emqx_bridge_oracle_SUITE.erl index 5c6eddb39..6dc3f4711 100644 --- a/apps/emqx_bridge_oracle/test/emqx_bridge_oracle_SUITE.erl +++ b/apps/emqx_bridge_oracle/test/emqx_bridge_oracle_SUITE.erl @@ -479,6 +479,8 @@ t_create_via_http(Config) -> end, [] ), + ResourceId = resource_id(Config), + ?assertMatch(1, length(ecpool:workers(ResourceId))), ok. t_start_stop(Config) -> diff --git a/apps/emqx_oracle/src/emqx_oracle.app.src b/apps/emqx_oracle/src/emqx_oracle.app.src index a5ca822e8..be3ed3276 100644 --- a/apps/emqx_oracle/src/emqx_oracle.app.src +++ b/apps/emqx_oracle/src/emqx_oracle.app.src @@ -1,6 +1,6 @@ {application, emqx_oracle, [ {description, "EMQX Enterprise Oracle Database Connector"}, - {vsn, "0.1.3"}, + {vsn, "0.1.4"}, {registered, []}, {applications, [ kernel, diff --git a/apps/emqx_oracle/src/emqx_oracle.erl b/apps/emqx_oracle/src/emqx_oracle.erl index 5a7f8d752..d379b7cf7 100644 --- a/apps/emqx_oracle/src/emqx_oracle.erl +++ b/apps/emqx_oracle/src/emqx_oracle.erl @@ -94,7 +94,7 @@ on_start( {password, jamdb_secret:wrap(maps:get(password, Config, ""))}, {sid, emqx_utils_conv:str(Sid)}, {service_name, ServiceName}, - {pool_size, maps:get(<<"pool_size">>, Config, ?DEFAULT_POOL_SIZE)}, + {pool_size, maps:get(pool_size, Config, ?DEFAULT_POOL_SIZE)}, {timeout, ?OPT_TIMEOUT}, {app_name, "EMQX Data To Oracle Database Action"} ], diff --git a/changes/ee/fix-11316.en.md b/changes/ee/fix-11316.en.md new file mode 100644 index 000000000..671e61048 --- /dev/null +++ b/changes/ee/fix-11316.en.md @@ -0,0 +1 @@ +Fixed Pool Size value not being considered in Oracle Bridge.