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

refactor: do not emit debug logs on periodic license checks

This commit is contained in:
Zaiming (Stone) Shi 2023-05-24 10:53:16 +02:00
parent c15e2f8708
commit 492a591298
5 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib-ee/emqx_license/src/emqx_license.erl
View File

@ -1,6 +1,7 @@
%%--------------------------------------------------------------------
%% Copyright (c) 2022-2023 EMQ Technologies Co., Ltd. All Rights Reserved.
%%--------------------------------------------------------------------
-module(emqx_license).
-include("emqx_license.hrl").

2
lib-ee/emqx_license/src/emqx_license_checker.erl
View File

@ -117,7 +117,7 @@ handle_cast(_Msg, State) ->
handle_info(check_license, #{license := License} = State) ->
#{} = check_license(License),
NewState = ensure_check_license_timer(State),
?tp(debug, emqx_license_checked, #{}),
?tp(emqx_license_checked, #{}),
{noreply, NewState};
handle_info(check_expiry_alarm, #{license := License} = State) ->
ok = expiry_early_alarm(License),

6
lib-ee/emqx_license/src/emqx_license_installer.erl
View File

@ -74,13 +74,13 @@ ensure_timer(#{interval := Interval} = State) ->
check_pid(#{name := Name, pid := OldPid, callback := Callback} = State) ->
case whereis(Name) of
undefined ->
?tp(debug, emqx_license_installer_noproc, #{old_pid => OldPid}),
?tp(emqx_license_installer_noproc, #{old_pid => OldPid}),
State;
OldPid ->
?tp(debug, emqx_license_installer_nochange, #{old_pid => OldPid}),
?tp(emqx_license_installer_nochange, #{old_pid => OldPid}),
State;
NewPid ->
_ = Callback(),
?tp(debug, emqx_license_installer_called, #{old_pid => OldPid}),
?tp(info, license_reloaded_after_emqx_app_restart, #{old_pid => OldPid}),
State#{pid => NewPid}
end.

2
lib-ee/emqx_license/src/emqx_license_resources.erl
View File

@ -76,7 +76,7 @@ handle_cast(_Msg, State) ->
handle_info(update_resources, State) ->
true = update_resources(),
connection_quota_early_alarm(),
?tp(debug, emqx_license_resources_updated, #{}),
?tp(emqx_license_resources_updated, #{}),
{noreply, ensure_timer(State)}.
terminate(_Reason, _State) ->

4
lib-ee/emqx_license/test/emqx_license_installer_SUITE.erl
View File

@ -74,12 +74,12 @@ t_update(_Config) ->
Pid1 = spawn_link(fun() -> timer:sleep(100) end),
register(installer_test, Pid1)
end,
#{?snk_kind := emqx_license_installer_called},
#{?snk_kind := license_reloaded_after_emqx_app_restart},
1000
)
end,
fun(Trace) ->
?assertMatch([_ | _], ?of_kind(emqx_license_installer_called, Trace))
?assertMatch([_ | _], ?of_kind(license_reloaded_after_emqx_app_restart, Trace))
end
).