diff --git a/apps/roster/src/roster_log_utils.erl b/apps/roster/src/roster_log_utils.erl new file mode 100644 index 0000000000000000000000000000000000000000..f63c5cddc0ac9707b8737ad69fd2ba2c7127a6fa --- /dev/null +++ b/apps/roster/src/roster_log_utils.erl @@ -0,0 +1,21 @@ +%%%------------------------------------------------------------------- +%%% @doc Utility functions to interact with logger. +%%% +%%% @end +%%%------------------------------------------------------------------- + +-module(roster_log_utils). + +-export([ turn_on_debug_log/0 + , turn_off_debug_log/0 + , set_system_log_level/1 + ]). + +turn_on_debug_log() -> + logger:update_handler_config(debug_handler, #{filter_default => log}). + +turn_off_debug_log() -> + logger:update_handler_config(debug_handler, #{filter_default => stop}). + +set_system_log_level(Level) -> + logger:set_primary_config(level, Level). diff --git a/rebar.config b/rebar.config index f95b39c13489e18e4cedf2ac7dce4a4f7073d8aa..282572a86efafc7d29c189a02995b20c0658902b 100644 --- a/rebar.config +++ b/rebar.config @@ -10,7 +10,7 @@ {bert, {git, "git://github.com/NYNJA-MC/bert.git", {branch, master}}}, {esockd, {git, "https://github.com/voxoz/esockd", {branch, "master"}}}, {bpe, {git, "git://github.com/synrc/bpe", {tag,"4.4"}}}, - {emqttd, {git, "git://github.com/NYNJA-MC/emqttd", {branch,"master"}}}, + {emqttd, {git, "git://github.com/NYNJA-MC/emqttd", {branch,"switch-from-lager-to-logger"}}}, {n2o, {git, "git://github.com/NYNJA-MC/n2o", {branch,"v6.4-otp21"}}}, {emqttc, {git, "git://github.com/NYNJA-MC/emqttc", {branch,"master"}}}, {rest, {git, "git://github.com/synrc/rest", {tag,"5.10"}}}, @@ -84,7 +84,7 @@ certifi,ibrowse,asn1,xmerl,counters,ctx, wts,syntax_tools,qdate_localtime, libphonenumber_erlang,syn,cowlib,jiffy,idna,parse_trans, - goldrush, public_key,bpe,lager,ssl,ranch, + goldrush, public_key,bpe,{lager,load},ssl,ranch, ssl_verify_fun,locus,emqttd,hackney,roster,service,active, cowboy,emq_dashboard,emqttc,enenra,envy,uuid,erlydtl,forms, gen_smtp, jwt, migresia, mini_s3, nitro, opencensus, diff --git a/rebar.lock b/rebar.lock index e9a99f0c735e803e9143890e79aa6f8695743483..2b124ac8af7cecbbed774dc165e6f2b644459808 100644 --- a/rebar.lock +++ b/rebar.lock @@ -43,7 +43,7 @@ 0}, {<<"emqttd">>, {git,"git://github.com/NYNJA-MC/emqttd", - {ref,"44352b2d4ea3fa0d41120c4310b149a0ca66a18a"}}, + {ref,"82488e8cf78fddb025a0dcc6e3caa567e75918bf"}}, 0}, {<<"enenra">>, {git,"https://github.com/nlfiedler/enenra", diff --git a/sys.config b/sys.config index 5b6ed35ae2260274735bfe41b8c297e84bab0d71..ac21587ec62332b27064b6b7175d270759b4f80d 100644 --- a/sys.config +++ b/sys.config @@ -12,7 +12,7 @@ , filesync_repeat_interval => 1000 }, formatter => {logger_formatter, - #{template => [time," [",level,"] ",pid," [", module, "] ", msg,"\n"]}} + #{template => [time," [",level,"] ",pid," [", mfa, "] ", msg,"\n"]}} }}, {handler, info_handler, logger_disk_log_h, #{level => info, @@ -23,7 +23,7 @@ , filesync_repeat_interval => 1000 }, formatter => {logger_formatter, - #{template => [time," [",level,"] ",pid," [", module, "] ", msg,"\n"]}} + #{template => [time," [",level,"] ",pid," [", mfa, "] ", msg,"\n"]}} }}, {handler, debug_handler, logger_disk_log_h, #{level => debug, @@ -33,8 +33,9 @@ , max_no_bytes => 10000000 , filesync_repeat_interval => 1000 }, + filter_default => stop, formatter => {logger_formatter, - #{template => [time," [",level,"] ",pid," [", module, "] ", msg,"\n"]}} + #{template => [time," [",level,"] ",pid," [", mfa, "] ", msg,"\n"]}} }} ]}]}, {review,[{host,"ns.synrc.com"}]},