yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor: move version prefix string detection to a static fun 

this is to make dialyzer happy
This commit is contained in:
Zaiming (Stone) Shi 2022-12-27 18:12:40 +01:00
parent 62d3943fc1
commit cac7e0c5f0
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/emqx/src/emqx_release.erl
View File

@ -18,6 +18,7 @@
-export([ -export([
edition/0, edition/0,
edition_vsn_prefix/0,
edition_longstr/0, edition_longstr/0,
description/0, description/0,
version/0 version/0
@ -45,11 +46,11 @@ description() ->
-spec edition() -> ce | ee. -spec edition() -> ce | ee.
-ifdef(EMQX_RELEASE_EDITION). -ifdef(EMQX_RELEASE_EDITION).
edition() -> ?EMQX_RELEASE_EDITION. edition() -> ?EMQX_RELEASE_EDITION.
edition_vsn_prefix() -> "e".
edition_longstr() -> <<"Enterprise">>. edition_longstr() -> <<"Enterprise">>.
-else. -else.
edition() -> ce. edition() -> ce.
edition_vsn_prefix() -> "v".
edition_longstr() -> <<"Opensource">>. edition_longstr() -> <<"Opensource">>.
-endif. -endif.

6
apps/emqx_machine/src/emqx_restricted_shell.erl
View File

@ -45,11 +45,7 @@ set_prompt_func() ->
prompt_func(PropList) -> prompt_func(PropList) ->
Line = proplists:get_value(history, PropList, 1), Line = proplists:get_value(history, PropList, 1),
Version = emqx_release:version(), Version = emqx_release:version(),
Prefix = Prefix = emqx_release:edition_vsn_prefix(),
case emqx_release:edition() of
ce -> "v";
ee -> "e"
end,
case is_alive() of case is_alive() of
true -> io_lib:format(<<"~ts~ts(~s)~w> ">>, [Prefix, Version, node(), Line]); true -> io_lib:format(<<"~ts~ts(~s)~w> ">>, [Prefix, Version, node(), Line]);
false -> io_lib:format(<<"~ts~ts ~w> ">>, [Prefix, Version, Line]) false -> io_lib:format(<<"~ts~ts ~w> ">>, [Prefix, Version, Line])