From b3862fb28352fdfefe6ff7aad5867260210129c1 Mon Sep 17 00:00:00 2001 From: JianBo He Date: Thu, 13 Jan 2022 17:30:20 +0800 Subject: [PATCH] chore: fix the app vsn and appup.src --- apps/emqx_management/src/emqx_management.app.src | 2 +- apps/emqx_management/src/emqx_management.appup.src | 10 ++++++++-- apps/emqx_retainer/src/emqx_retainer.app.src | 2 +- apps/emqx_retainer/src/emqx_retainer.appup.src | 6 ++++-- apps/emqx_rule_engine/src/emqx_rule_engine.app.src | 2 +- .../src/emqx_rule_engine.appup.src | 14 ++++++++++++-- apps/emqx_rule_engine/src/emqx_rule_metrics.erl | 8 ++++---- src/emqx.app.src | 2 +- src/emqx.appup.src | 8 ++++++-- 9 files changed, 38 insertions(+), 16 deletions(-) diff --git a/apps/emqx_management/src/emqx_management.app.src b/apps/emqx_management/src/emqx_management.app.src index fe68fef44..1efd30dcc 100644 --- a/apps/emqx_management/src/emqx_management.app.src +++ b/apps/emqx_management/src/emqx_management.app.src @@ -1,6 +1,6 @@ {application, emqx_management, [{description, "EMQ X Management API and CLI"}, - {vsn, "4.4.0"}, % strict semver, bump manually! + {vsn, "4.4.1"}, % strict semver, bump manually! {modules, []}, {registered, [emqx_management_sup]}, {applications, [kernel,stdlib,minirest]}, diff --git a/apps/emqx_management/src/emqx_management.appup.src b/apps/emqx_management/src/emqx_management.appup.src index 109eeef80..5121efb88 100644 --- a/apps/emqx_management/src/emqx_management.appup.src +++ b/apps/emqx_management/src/emqx_management.appup.src @@ -1,5 +1,11 @@ %% -*- mode: erlang -*- {VSN, - [{<<".*">>,[]}], - [{<<".*">>,[]}] + [{<<".*">>, + [{apply,{minirest,stop_http,['http:management']}}, + {apply,{minirest,stop_http,['https:management']}}, + {restart_application, emqx_management}]}], + [{<<".*">>, + [{apply,{minirest,stop_http,['http:management']}}, + {apply,{minirest,stop_http,['https:management']}}, + {restart_application, emqx_management}]}] }. diff --git a/apps/emqx_retainer/src/emqx_retainer.app.src b/apps/emqx_retainer/src/emqx_retainer.app.src index a423fb9b7..4ef423b78 100644 --- a/apps/emqx_retainer/src/emqx_retainer.app.src +++ b/apps/emqx_retainer/src/emqx_retainer.app.src @@ -1,6 +1,6 @@ {application, emqx_retainer, [{description, "EMQ X Retainer"}, - {vsn, "4.4.0"}, % strict semver, bump manually! + {vsn, "4.4.1"}, % strict semver, bump manually! {modules, []}, {registered, [emqx_retainer_sup]}, {applications, [kernel,stdlib]}, diff --git a/apps/emqx_retainer/src/emqx_retainer.appup.src b/apps/emqx_retainer/src/emqx_retainer.appup.src index 109eeef80..82f353e6e 100644 --- a/apps/emqx_retainer/src/emqx_retainer.appup.src +++ b/apps/emqx_retainer/src/emqx_retainer.appup.src @@ -1,5 +1,7 @@ %% -*- mode: erlang -*- {VSN, - [{<<".*">>,[]}], - [{<<".*">>,[]}] + [{"4.4.0",[{load_module,emqx_retainer_cli,brutal_purge,soft_purge,[]}]}, + {<<".*">>,[]}], + [{"4.4.0",[{load_module,emqx_retainer_cli,brutal_purge,soft_purge,[]}]}, + {<<".*">>,[]}] }. diff --git a/apps/emqx_rule_engine/src/emqx_rule_engine.app.src b/apps/emqx_rule_engine/src/emqx_rule_engine.app.src index 98e5487e2..eaeded042 100644 --- a/apps/emqx_rule_engine/src/emqx_rule_engine.app.src +++ b/apps/emqx_rule_engine/src/emqx_rule_engine.app.src @@ -1,6 +1,6 @@ {application, emqx_rule_engine, [{description, "EMQ X Rule Engine"}, - {vsn, "4.4.0"}, % strict semver, bump manually! + {vsn, "4.4.1"}, % strict semver, bump manually! {modules, []}, {registered, [emqx_rule_engine_sup, emqx_rule_registry]}, {applications, [kernel,stdlib,rulesql,getopt]}, diff --git a/apps/emqx_rule_engine/src/emqx_rule_engine.appup.src b/apps/emqx_rule_engine/src/emqx_rule_engine.appup.src index 109eeef80..1e146ebd9 100644 --- a/apps/emqx_rule_engine/src/emqx_rule_engine.appup.src +++ b/apps/emqx_rule_engine/src/emqx_rule_engine.appup.src @@ -1,5 +1,15 @@ %% -*- mode: erlang -*- {VSN, - [{<<".*">>,[]}], - [{<<".*">>,[]}] + [{"4.4.0", + [ {update, emqx_rule_metrics, {advanced, ["4.4.0"]}} + , {load_module,emqx_rule_engine,brutal_purge,soft_purge,[]} + , {load_module,emqx_rule_runtime,brutal_purge,soft_purge,[]} + ]}, + {<<".*">>,[]}], + [{"4.4.0", + [ {update, emqx_rule_metrics, {advanced, ["4.4.0"]}} + , {load_module,emqx_rule_engine,brutal_purge,soft_purge,[]} + , {load_module,emqx_rule_runtime,brutal_purge,soft_purge,[]} + ]}, + {<<".*">>,[]}] }. diff --git a/apps/emqx_rule_engine/src/emqx_rule_metrics.erl b/apps/emqx_rule_engine/src/emqx_rule_metrics.erl index 8532ec4f7..0da6b1197 100644 --- a/apps/emqx_rule_engine/src/emqx_rule_metrics.erl +++ b/apps/emqx_rule_engine/src/emqx_rule_metrics.erl @@ -328,9 +328,9 @@ handle_info(_Info, State) -> code_change({down, _Vsn}, State = #state{metric_ids = MIDs}, [Vsn]) -> case string:tokens(Vsn, ".") of - ["4", "3", SVal] -> + ["4", "4", SVal] -> {Val, []} = string:to_integer(SVal), - case Val =< 7 of + case Val == 0 of true -> [begin Passed = get_rules_passed(Id), @@ -356,9 +356,9 @@ code_change({down, _Vsn}, State = #state{metric_ids = MIDs}, [Vsn]) -> code_change(_Vsn, State = #state{metric_ids = MIDs}, [Vsn]) -> case string:tokens(Vsn, ".") of - ["4", "3", SVal] -> + ["4", "4", SVal] -> {Val, []} = string:to_integer(SVal), - case Val =< 7 of + case Val == 0 of true -> [begin Matched = get_rules_matched(Id), diff --git a/src/emqx.app.src b/src/emqx.app.src index fa501f461..f5b739e48 100644 --- a/src/emqx.app.src +++ b/src/emqx.app.src @@ -1,7 +1,7 @@ {application, emqx, [{id, "emqx"}, {description, "EMQ X"}, - {vsn, "4.4.0"}, % strict semver, bump manually! + {vsn, "4.4.1"}, % strict semver, bump manually! {modules, []}, {registered, []}, {applications, [kernel,stdlib,gproc,gen_rpc,esockd,cowboy,sasl,os_mon]}, diff --git a/src/emqx.appup.src b/src/emqx.appup.src index 109eeef80..15f962297 100644 --- a/src/emqx.appup.src +++ b/src/emqx.appup.src @@ -1,5 +1,9 @@ %% -*- mode: erlang -*- {VSN, - [{<<".*">>,[]}], - [{<<".*">>,[]}] + [{"4.4.0", + [{load_module,emqx_channel,brutal_purge,soft_purge,[]}]}, + {<<".*">>,[]}], + [{"4.4.0", + [{load_module,emqx_channel,brutal_purge,soft_purge,[]}]}, + {<<".*">>,[]}] }.