yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #10664 from kjellwinblad/kjell/fix/rabbitmq_and_iotdb_issues 

Fix small RabbitMQ and IotDB issues
This commit is contained in:
Kjell Winblad 2023-05-10 14:48:20 +02:00 committed by GitHub
parent 594ceaf9e6 41f5eff014
commit 296c870896
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/emqx_bridge_iotdb/src/emqx_bridge_iotdb.erl
View File

@ -54,6 +54,7 @@ fields(auth_basic) ->
mk(binary(), #{ mk(binary(), #{
required => true, required => true,
desc => ?DESC("config_auth_basic_password"), desc => ?DESC("config_auth_basic_password"),
format => <<"password">>,
sensitive => true, sensitive => true,
converter => fun emqx_schema:password_converter/2 converter => fun emqx_schema:password_converter/2
})} })}

2
apps/emqx_bridge_rabbitmq/src/emqx_bridge_rabbitmq.erl
View File

@ -95,7 +95,7 @@ fields("config") ->
fields("creation_opts") -> fields("creation_opts") ->
emqx_resource_schema:fields("creation_opts"); emqx_resource_schema:fields("creation_opts");
fields("post") -> fields("post") ->
fields("post", clickhouse); fields("post", rabbitmq);
fields("put") -> fields("put") ->
fields("config"); fields("config");
fields("get") -> fields("get") ->

17
apps/emqx_bridge_rabbitmq/src/emqx_bridge_rabbitmq_connector.erl
View File

@ -72,14 +72,7 @@ fields(config) ->
desc => ?DESC("username") desc => ?DESC("username")
} }
)}, )},
{password, {password, fun emqx_connector_schema_lib:password/1},
hoconsc:mk(
typerefl:binary(),
#{
required => true,
desc => ?DESC("password")
}
)},
{pool_size, {pool_size,
hoconsc:mk( hoconsc:mk(
typerefl:pos_integer(), typerefl:pos_integer(),
@ -129,14 +122,6 @@ fields(config) ->
desc => ?DESC("heartbeat") desc => ?DESC("heartbeat")
} }
)}, )},
{auto_reconnect,
hoconsc:mk(
emqx_schema:duration_ms(),
#{
default => <<"2s">>,
desc => ?DESC("auto_reconnect")
}
)},
%% Things related to sending messages to RabbitMQ %% Things related to sending messages to RabbitMQ
{exchange, {exchange,
hoconsc:mk( hoconsc:mk(