From 5c69500c52602574fbe925cec16c1ebb4c421695 Mon Sep 17 00:00:00 2001 From: firest Date: Tue, 27 Feb 2024 15:47:46 +0800 Subject: [PATCH 1/3] fix(ldap): fix that logs of eldap will never be logged --- apps/emqx_ldap/src/emqx_ldap.erl | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/apps/emqx_ldap/src/emqx_ldap.erl b/apps/emqx_ldap/src/emqx_ldap.erl index 04b61918a..0758d0477 100644 --- a/apps/emqx_ldap/src/emqx_ldap.erl +++ b/apps/emqx_ldap/src/emqx_ldap.erl @@ -312,11 +312,12 @@ do_ldap_query( {error, {unrecoverable_error, Reason}} end. -log(Level, Format, Args) -> +%% Note: the value of the `_Level` here always is 2 +log(_Level, Format, Args) -> ?SLOG( - Level, + info, #{ - msg => "ldap_log", + msg => "eldap_info", log => io_lib:format(Format, Args) } ). From f3237a1bf78a938bc0c8278b90271154969e3749 Mon Sep 17 00:00:00 2001 From: firest Date: Tue, 27 Feb 2024 16:08:47 +0800 Subject: [PATCH 2/3] chore: bump emqx_ldap version --- apps/emqx_ldap/src/emqx_ldap.app.src | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/emqx_ldap/src/emqx_ldap.app.src b/apps/emqx_ldap/src/emqx_ldap.app.src index 546c9975c..3598d317c 100644 --- a/apps/emqx_ldap/src/emqx_ldap.app.src +++ b/apps/emqx_ldap/src/emqx_ldap.app.src @@ -1,6 +1,6 @@ {application, emqx_ldap, [ {description, "EMQX LDAP Connector"}, - {vsn, "0.1.6"}, + {vsn, "0.1.7"}, {registered, []}, {applications, [ kernel, From 37026fa94f095864880d34eada0caef99e679a79 Mon Sep 17 00:00:00 2001 From: firest Date: Tue, 27 Feb 2024 21:03:53 +0800 Subject: [PATCH 3/3] chore: update change --- changes/ce/fix-12601.en.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 changes/ce/fix-12601.en.md diff --git a/changes/ce/fix-12601.en.md b/changes/ce/fix-12601.en.md new file mode 100644 index 000000000..076946f37 --- /dev/null +++ b/changes/ce/fix-12601.en.md @@ -0,0 +1 @@ +Fixed that the logs of LDAP driver would never be logged, now all of them are logged with `info` level.