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

Change default logger level to warning

This commit is contained in:
terry-xiaoyu 2019-06-27 15:07:10 +08:00 committed by turtleDeng
parent 0e2e4e73ca
commit 96fff39535
6 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
etc/emqx.conf
View File

@ -354,8 +354,8 @@ log.to = both
## Note: Only the messages with severity level higher than or equal to ## Note: Only the messages with severity level higher than or equal to
## this level will be logged. ## this level will be logged.
## ##
## Default: error ## Default: warning
log.level = error log.level = warning
## The dir for log files. ## The dir for log files.
## ##

4
priv/emqx.schema
View File

@ -396,12 +396,12 @@ end}.
]}. ]}.
{mapping, "log.level", "kernel.logger", [ {mapping, "log.level", "kernel.logger", [
{default, error}, {default, warning},
{datatype, {enum, [debug, info, notice, warning, error, critical, alert, emergency, all]}} {datatype, {enum, [debug, info, notice, warning, error, critical, alert, emergency, all]}}
]}. ]}.
{mapping, "log.primary_log_level", "kernel.logger_level", [ {mapping, "log.primary_log_level", "kernel.logger_level", [
{default, error}, {default, warning},
{datatype, {enum, [debug, info, notice, warning, error, critical, alert, emergency, all]}} {datatype, {enum, [debug, info, notice, warning, error, critical, alert, emergency, all]}}
]}. ]}.

8
src/emqx_alarm_handler.erl
View File

@ -95,7 +95,7 @@ init(_) ->
handle_event({set_alarm, {AlarmId, AlarmDesc = #alarm{timestamp = undefined}}}, State) -> handle_event({set_alarm, {AlarmId, AlarmDesc = #alarm{timestamp = undefined}}}, State) ->
handle_event({set_alarm, {AlarmId, AlarmDesc#alarm{timestamp = os:timestamp()}}}, State); handle_event({set_alarm, {AlarmId, AlarmDesc#alarm{timestamp = os:timestamp()}}}, State);
handle_event({set_alarm, Alarm = {AlarmId, AlarmDesc}}, State) -> handle_event({set_alarm, Alarm = {AlarmId, AlarmDesc}}, State) ->
?LOG(warning, "~p set", [Alarm]), ?LOG(warning, "New Alarm: ~p, Alarm Info: ~p", [AlarmId, AlarmDesc]),
case encode_alarm(Alarm) of case encode_alarm(Alarm) of
{ok, Json} -> {ok, Json} ->
emqx_broker:safe_publish(alarm_msg(topic(alert), Json)); emqx_broker:safe_publish(alarm_msg(topic(alert), Json));
@ -105,7 +105,7 @@ handle_event({set_alarm, Alarm = {AlarmId, AlarmDesc}}, State) ->
set_alarm_(AlarmId, AlarmDesc), set_alarm_(AlarmId, AlarmDesc),
{ok, State}; {ok, State};
handle_event({clear_alarm, AlarmId}, State) -> handle_event({clear_alarm, AlarmId}, State) ->
?LOG(notice, "~p clear", [AlarmId]), ?LOG(warning, "Clear Alarm: ~p", [AlarmId]),
case encode_alarm({AlarmId, undefined}) of case encode_alarm({AlarmId, undefined}) of
{ok, Json} -> {ok, Json} ->
emqx_broker:safe_publish(alarm_msg(topic(clear), Json)); emqx_broker:safe_publish(alarm_msg(topic(clear), Json));
@ -138,9 +138,9 @@ init_tables(ExistingAlarms) ->
set_alarm_history(Id) set_alarm_history(Id)
end, ExistingAlarms). end, ExistingAlarms).
encode_alarm({AlarmId, #alarm{severity = Severity, encode_alarm({AlarmId, #alarm{severity = Severity,
title = Title, title = Title,
summary = Summary, summary = Summary,
timestamp = Ts}}) -> timestamp = Ts}}) ->
emqx_json:safe_encode([{id, maybe_to_binary(AlarmId)}, emqx_json:safe_encode([{id, maybe_to_binary(AlarmId)},
{desc, [{severity, Severity}, {desc, [{severity, Severity},

2
src/emqx_session_sup.erl
View File

@ -119,7 +119,7 @@ handle_info({'EXIT', Pid, _Reason}, State = #state{sessions = SessMap, clean_dow
{noreply, State#state{sessions = SessMap1}}; {noreply, State#state{sessions = SessMap1}};
handle_info(Info, State) -> handle_info(Info, State) ->
?LOG(notice, "Unexpected info: ~p", [Info]), ?LOG(error, "Unexpected info: ~p", [Info]),
{noreply, State}. {noreply, State}.
terminate(_Reason, State) -> terminate(_Reason, State) ->

2
test/emqx_protocol_SUITE.erl
View File

@ -245,7 +245,7 @@ connect_v5(_) ->
#{version => ?MQTT_PROTO_V5} #{version => ?MQTT_PROTO_V5}
)), )),
{ok, Data3} = gen_tcp:recv(Sock, 0), {ok, Data3} = gen_tcp:recv(Sock, 6),
{ok, ?PUBACK_PACKET(1, 0), <<>>, _} = raw_recv_parse(Data3, ?MQTT_PROTO_V5), {ok, ?PUBACK_PACKET(1, 0), <<>>, _} = raw_recv_parse(Data3, ?MQTT_PROTO_V5),

2
test/emqx_tracer_SUITE.erl
View File

@ -75,4 +75,4 @@ start_traces(_Config) ->
ok = emqx_tracer:stop_trace({topic, <<"a/#">>}), ok = emqx_tracer:stop_trace({topic, <<"a/#">>}),
emqx_client:disconnect(T), emqx_client:disconnect(T),
emqx_logger:set_log_level(error). emqx_logger:set_log_level(warning).