From 6bb8bf58eaeaad02989de3055d1aa6c6e9729df4 Mon Sep 17 00:00:00 2001 From: firest Date: Fri, 23 Jun 2023 16:51:19 +0000 Subject: [PATCH 1/2] fix(retainer): rename deliver_rate to delivery_rate --- apps/emqx_retainer/src/emqx_retainer_schema.erl | 9 +++++++-- rel/i18n/emqx_retainer_schema.hocon | 4 ++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/apps/emqx_retainer/src/emqx_retainer_schema.erl b/apps/emqx_retainer/src/emqx_retainer_schema.erl index c2cbf5135..4b1a651bc 100644 --- a/apps/emqx_retainer/src/emqx_retainer_schema.erl +++ b/apps/emqx_retainer/src/emqx_retainer_schema.erl @@ -75,10 +75,15 @@ fields("retainer") -> stop_publish_clear_msg, false )}, - {deliver_rate, + {delivery_rate, ?HOCON( emqx_limiter_schema:rate(), - #{required => false, desc => ?DESC(deliver_rate), example => <<"1000/s">>} + #{ + required => false, + desc => ?DESC(delivery_rate), + example => <<"1000/s">>, + aliases => [deliver_rate] + } )}, {backend, backend_config()} ]; diff --git a/rel/i18n/emqx_retainer_schema.hocon b/rel/i18n/emqx_retainer_schema.hocon index 45696534d..49b55d259 100644 --- a/rel/i18n/emqx_retainer_schema.hocon +++ b/rel/i18n/emqx_retainer_schema.hocon @@ -46,6 +46,6 @@ whether to continue to publish the message. See: http://docs.oasis-open.org/mqtt/mqtt/v3.1.1/os/mqtt-v3.1.1-os.html#_Toc398718038""" -deliver_rate.desc: -"""The maximum rate of delivering retain messages""" +delivery_rate.desc: +"""The maximum rate of delivering retained messages""" } From 60a1f5a38dd0d1ce680f12e84df2775b59365dba Mon Sep 17 00:00:00 2001 From: firest Date: Fri, 23 Jun 2023 17:01:22 +0000 Subject: [PATCH 2/2] chore: update app version && changes --- apps/emqx_retainer/src/emqx_retainer.app.src | 2 +- changes/ce/feat-11133.en.md | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 changes/ce/feat-11133.en.md diff --git a/apps/emqx_retainer/src/emqx_retainer.app.src b/apps/emqx_retainer/src/emqx_retainer.app.src index 9cd7ba09d..d13359509 100644 --- a/apps/emqx_retainer/src/emqx_retainer.app.src +++ b/apps/emqx_retainer/src/emqx_retainer.app.src @@ -2,7 +2,7 @@ {application, emqx_retainer, [ {description, "EMQX Retainer"}, % strict semver, bump manually! - {vsn, "5.0.13"}, + {vsn, "5.0.14"}, {modules, []}, {registered, [emqx_retainer_sup]}, {applications, [kernel, stdlib, emqx, emqx_ctl]}, diff --git a/changes/ce/feat-11133.en.md b/changes/ce/feat-11133.en.md new file mode 100644 index 000000000..4d7bfb2ee --- /dev/null +++ b/changes/ce/feat-11133.en.md @@ -0,0 +1 @@ +Rename `deliver_rate` to `delivery_rate` in the configuration of `retainer`.