chore(license): add LICENSE tag to logs
This commit is contained in:
parent
2c81b56377
commit
38e30622f3
|
@ -80,24 +80,29 @@ update_setting(Setting) when is_map(Setting) ->
|
||||||
check(_ConnInfo, AckProps) ->
|
check(_ConnInfo, AckProps) ->
|
||||||
case emqx_license_checker:limits() of
|
case emqx_license_checker:limits() of
|
||||||
{ok, #{max_connections := ?ERR_EXPIRED}} ->
|
{ok, #{max_connections := ?ERR_EXPIRED}} ->
|
||||||
?SLOG(error, #{msg => "connection_rejected_due_to_license_expired"}),
|
?SLOG(error, #{msg => "connection_rejected_due_to_license_expired"}, #{tag => "LICENSE"}),
|
||||||
{stop, {error, ?RC_QUOTA_EXCEEDED}};
|
{stop, {error, ?RC_QUOTA_EXCEEDED}};
|
||||||
{ok, #{max_connections := MaxClients}} ->
|
{ok, #{max_connections := MaxClients}} ->
|
||||||
case check_max_clients_exceeded(MaxClients) of
|
case check_max_clients_exceeded(MaxClients) of
|
||||||
true ->
|
true ->
|
||||||
?SLOG_THROTTLE(
|
?SLOG_THROTTLE(
|
||||||
error,
|
error,
|
||||||
#{msg => connection_rejected_due_to_license_limit_reached}
|
#{msg => connection_rejected_due_to_license_limit_reached},
|
||||||
|
#{tag => "LICENSE"}
|
||||||
),
|
),
|
||||||
{stop, {error, ?RC_QUOTA_EXCEEDED}};
|
{stop, {error, ?RC_QUOTA_EXCEEDED}};
|
||||||
false ->
|
false ->
|
||||||
{ok, AckProps}
|
{ok, AckProps}
|
||||||
end;
|
end;
|
||||||
{error, Reason} ->
|
{error, Reason} ->
|
||||||
?SLOG(error, #{
|
?SLOG(
|
||||||
|
error,
|
||||||
|
#{
|
||||||
msg => "connection_rejected_due_to_license_not_loaded",
|
msg => "connection_rejected_due_to_license_not_loaded",
|
||||||
reason => Reason
|
reason => Reason
|
||||||
}),
|
},
|
||||||
|
#{tag => "LICENSE"}
|
||||||
|
),
|
||||||
{stop, {error, ?RC_QUOTA_EXCEEDED}}
|
{stop, {error, ?RC_QUOTA_EXCEEDED}}
|
||||||
end.
|
end.
|
||||||
|
|
||||||
|
|
|
@ -172,11 +172,15 @@ refresh(State) ->
|
||||||
State.
|
State.
|
||||||
|
|
||||||
log_new_license(Old, New) ->
|
log_new_license(Old, New) ->
|
||||||
?SLOG(info, #{
|
?SLOG(
|
||||||
|
info,
|
||||||
|
#{
|
||||||
msg => "new_license_loaded",
|
msg => "new_license_loaded",
|
||||||
old_license => emqx_license_parser:summary(Old),
|
old_license => emqx_license_parser:summary(Old),
|
||||||
new_license => emqx_license_parser:summary(New)
|
new_license => emqx_license_parser:summary(New)
|
||||||
}).
|
},
|
||||||
|
#{tag => "LICENSE"}
|
||||||
|
).
|
||||||
|
|
||||||
ensure_check_license_timer(#{check_license_interval := CheckInterval} = State) ->
|
ensure_check_license_timer(#{check_license_interval := CheckInterval} = State) ->
|
||||||
ok = cancel_timer(State, check_timer),
|
ok = cancel_timer(State, check_timer),
|
||||||
|
|
|
@ -129,13 +129,17 @@ error_msg(Code, Msg) ->
|
||||||
'/license'(post, #{body := #{<<"key">> := Key}}) ->
|
'/license'(post, #{body := #{<<"key">> := Key}}) ->
|
||||||
case emqx_license:update_key(Key) of
|
case emqx_license:update_key(Key) of
|
||||||
{error, Error} ->
|
{error, Error} ->
|
||||||
?SLOG(error, #{
|
?SLOG(
|
||||||
|
error,
|
||||||
|
#{
|
||||||
msg => "bad_license_key",
|
msg => "bad_license_key",
|
||||||
reason => Error
|
reason => Error
|
||||||
}),
|
},
|
||||||
|
#{tag => "LICENSE"}
|
||||||
|
),
|
||||||
{400, error_msg(?BAD_REQUEST, <<"Bad license key">>)};
|
{400, error_msg(?BAD_REQUEST, <<"Bad license key">>)};
|
||||||
{ok, _} ->
|
{ok, _} ->
|
||||||
?SLOG(info, #{msg => "updated_license_key"}),
|
?SLOG(info, #{msg => "updated_license_key"}, #{tag => "LICENSE"}),
|
||||||
License = maps:from_list(emqx_license_checker:dump()),
|
License = maps:from_list(emqx_license_checker:dump()),
|
||||||
{200, License}
|
{200, License}
|
||||||
end;
|
end;
|
||||||
|
@ -147,13 +151,17 @@ error_msg(Code, Msg) ->
|
||||||
'/license/setting'(put, #{body := Setting}) ->
|
'/license/setting'(put, #{body := Setting}) ->
|
||||||
case emqx_license:update_setting(Setting) of
|
case emqx_license:update_setting(Setting) of
|
||||||
{error, Error} ->
|
{error, Error} ->
|
||||||
?SLOG(error, #{
|
?SLOG(
|
||||||
|
error,
|
||||||
|
#{
|
||||||
msg => "bad_license_setting",
|
msg => "bad_license_setting",
|
||||||
reason => Error
|
reason => Error
|
||||||
}),
|
},
|
||||||
|
#{tag => "LICENSE"}
|
||||||
|
),
|
||||||
{400, error_msg(?BAD_REQUEST, <<"Bad license setting">>)};
|
{400, error_msg(?BAD_REQUEST, <<"Bad license setting">>)};
|
||||||
{ok, _} ->
|
{ok, _} ->
|
||||||
?SLOG(info, #{msg => "updated_license_setting"}),
|
?SLOG(info, #{msg => "updated_license_setting"}, #{tag => "LICENSE"}),
|
||||||
'/license/setting'(get, undefined)
|
'/license/setting'(get, undefined)
|
||||||
end.
|
end.
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue