Merge pull request #6735 from HJianBo/fix-app-vsn-sync

chore: fix the app vsn and appup.src
This commit is contained in:
JianBo He 2022-01-14 09:13:57 +08:00 committed by GitHub
commit bd9669c73f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 38 additions and 16 deletions

View File

@ -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]},

View File

@ -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}]}]
}.

View File

@ -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]},

View File

@ -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,[]}]},
{<<".*">>,[]}]
}.

View File

@ -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]},

View File

@ -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,[]}
]},
{<<".*">>,[]}]
}.

View File

@ -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),

View File

@ -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]},

View File

@ -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,[]}]},
{<<".*">>,[]}]
}.