Jelajahi Sumber

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

Fix small RabbitMQ and IotDB issues
Kjell Winblad 2 tahun lalu
induk
melakukan
296c870896

+ 1 - 0
apps/emqx_bridge_iotdb/src/emqx_bridge_iotdb.erl

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

+ 1 - 1
apps/emqx_bridge_rabbitmq/src/emqx_bridge_rabbitmq.erl

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

+ 1 - 16
apps/emqx_bridge_rabbitmq/src/emqx_bridge_rabbitmq_connector.erl

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