Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(config): add back reconnect_interval field as deprecated #9946

Merged
merged 1 commit into from
Feb 10, 2023
Merged

fix(config): add back reconnect_interval field as deprecated #9946

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions apps/emqx_bridge/test/emqx_bridge_compatible_config_tests.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,7 @@ bridges {
keepalive = \"60s\"
mode = cluster_shareload
proto_ver = \"v4\"
reconnect_interval = \"15s\"
server = \"localhost:1883\"
ssl {enable = false, verify = \"verify_peer\"}
}
Expand All @@ -194,6 +195,7 @@ bridges {
keepalive = \"60s\"
mode = \"cluster_shareload\"
proto_ver = \"v4\"
reconnect_interval = \"15s\"
server = \"localhost:1883\"
ssl {enable = false, verify = \"verify_peer\"}
}
Expand Down
2 changes: 1 addition & 1 deletion apps/emqx_connector/src/emqx_connector.app.src
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
%% -*- mode: erlang -*-
{application, emqx_connector, [
{description, "EMQX Data Integration Connectors"},
{vsn, "0.1.13"},
{vsn, "0.1.14"},
{registered, []},
{mod, {emqx_connector_app, []}},
{applications, [
Expand Down
1 change: 1 addition & 0 deletions apps/emqx_connector/src/mqtt/emqx_connector_mqtt_schema.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ fields("server_configs") ->
)},
{server, emqx_schema:servers_sc(#{desc => ?DESC("server")}, ?MQTT_HOST_OPTS)},
{clientid_prefix, mk(binary(), #{required => false, desc => ?DESC("clientid_prefix")})},
{reconnect_interval, mk(string(), #{deprecated => {since, "v5.0.16"}})},
{proto_ver,
mk(
hoconsc:enum([v3, v4, v5]),
Expand Down
3 changes: 3 additions & 0 deletions changes/v5.0.17/fix-9946.en.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Add back `reconnect_interval` as deprecated field for MQTT bridge.
The field was removed from v5.0.16/e5.0.0 by mistake, caused new version unable to start on old config.
Now it's added back as deprecated (config value is ignored if provided).
2 changes: 2 additions & 0 deletions changes/v5.0.17/fix-9946.zh.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
MQTT 桥接配置参数 `reconnect_interval` 在 v5.0.16/e5.0.0 中被错误删除，
导致旧版本配置在升级后无法使用。此修复把配置加回，但是值会忽略。