From 80acfa8b75251192306fb3aaaa8b090df14043d2 Mon Sep 17 00:00:00 2001 From: Tobias Lindahl Date: Tue, 12 May 2020 13:25:32 +0200 Subject: [PATCH 1/5] Add 'mfa' to log entries, rather than the failing 'module' --- sys.config | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys.config b/sys.config index 5b6ed35ae..08ff1f643 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, @@ -34,7 +34,7 @@ , filesync_repeat_interval => 1000 }, formatter => {logger_formatter, - #{template => [time," [",level,"] ",pid," [", module, "] ", msg,"\n"]}} + #{template => [time," [",level,"] ",pid," [", mfa, "] ", msg,"\n"]}} }} ]}]}, {review,[{host,"ns.synrc.com"}]}, -- GitLab From eab87456de41005fb47c6bd8e841a3464cab2b19 Mon Sep 17 00:00:00 2001 From: Tobias Lindahl Date: Tue, 12 May 2020 11:23:49 +0200 Subject: [PATCH 2/5] Upgrade to latest emqttd (process registration) --- rebar.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rebar.lock b/rebar.lock index e9a99f0c7..23e1c39d5 100644 --- a/rebar.lock +++ b/rebar.lock @@ -43,7 +43,7 @@ 0}, {<<"emqttd">>, {git,"git://github.com/NYNJA-MC/emqttd", - {ref,"44352b2d4ea3fa0d41120c4310b149a0ca66a18a"}}, + {ref,"364bf8d4979884fc5e9e765c0fa92d97b78a8fa9"}}, 0}, {<<"enenra">>, {git,"https://github.com/nlfiedler/enenra", -- GitLab From 0dbb66292112442eed808293cf88d1c09cd78ac9 Mon Sep 17 00:00:00 2001 From: Tobias Lindahl Date: Thu, 14 May 2020 09:26:18 +0200 Subject: [PATCH 3/5] Use emqttd switched to logger instead of lager --- rebar.config | 4 ++-- rebar.lock | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rebar.config b/rebar.config index f95b39c13..282572a86 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 23e1c39d5..2b124ac8a 100644 --- a/rebar.lock +++ b/rebar.lock @@ -43,7 +43,7 @@ 0}, {<<"emqttd">>, {git,"git://github.com/NYNJA-MC/emqttd", - {ref,"364bf8d4979884fc5e9e765c0fa92d97b78a8fa9"}}, + {ref,"82488e8cf78fddb025a0dcc6e3caa567e75918bf"}}, 0}, {<<"enenra">>, {git,"https://github.com/nlfiedler/enenra", -- GitLab From b73632476c11ffdfa431570adab767541a432d47 Mon Sep 17 00:00:00 2001 From: Tobias Lindahl Date: Thu, 14 May 2020 14:12:10 +0200 Subject: [PATCH 4/5] Don't log in debug log file unless you really want it --- sys.config | 1 + 1 file changed, 1 insertion(+) diff --git a/sys.config b/sys.config index 08ff1f643..ac21587ec 100644 --- a/sys.config +++ b/sys.config @@ -33,6 +33,7 @@ , max_no_bytes => 10000000 , filesync_repeat_interval => 1000 }, + filter_default => stop, formatter => {logger_formatter, #{template => [time," [",level,"] ",pid," [", mfa, "] ", msg,"\n"]}} }} -- GitLab From 2a44068c11404b121ae5891d7b9546cf2be2d98c Mon Sep 17 00:00:00 2001 From: Tobias Lindahl Date: Thu, 14 May 2020 14:44:30 +0200 Subject: [PATCH 5/5] Add utility to interact with logger --- apps/roster/src/roster_log_utils.erl | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 apps/roster/src/roster_log_utils.erl diff --git a/apps/roster/src/roster_log_utils.erl b/apps/roster/src/roster_log_utils.erl new file mode 100644 index 000000000..f63c5cddc --- /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). -- GitLab