From f9aa3457874b8d0aaa11074b29063ee786874312 Mon Sep 17 00:00:00 2001
From: zhouzb <zhouzb@emqx.io>
Date: Mon, 27 Sep 2021 15:32:56 +0800
Subject: [PATCH] chore(psk): improve logs for psk

---
 apps/emqx/src/emqx_tls_psk.erl | 22 ++++++++++++++++------
 apps/emqx_psk/src/emqx_psk.erl |  2 +-
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/apps/emqx/src/emqx_tls_psk.erl b/apps/emqx/src/emqx_tls_psk.erl
index 7a8238182..d071dbb9a 100644
--- a/apps/emqx/src/emqx_tls_psk.erl
+++ b/apps/emqx/src/emqx_tls_psk.erl
@@ -26,13 +26,23 @@
 
 -spec lookup(psk, psk_identity(), psk_user_state()) -> {ok, SharedSecret :: binary()} | error.
 lookup(psk, PSKIdentity, UserState) ->
-    try emqx_hooks:run_fold('tls_handshake.psk_lookup', [PSKIdentity], UserState) of
-        SharedSecret when is_binary(SharedSecret) -> {ok, SharedSecret};
-        Error ->
-            ?LOG(error, "Look PSK for PSKID ~p error: ~p", [PSKIdentity, Error]),
+    try emqx_hooks:run_fold('tls_handshake.psk_lookup', [PSKIdentity, UserState], normal) of
+        {ok, SharedSecret} when is_binary(SharedSecret) ->
+            {ok, SharedSecret};
+        normal ->
+            ?SLOG(info, #{msg => "psk_identity_not_found",
+                          psk_identity => PSKIdentity}),
+            error;
+        {error, Reason} ->
+            ?SLOG(warning, #{msg => "psk_identity_not_found",
+                             psk_identity => PSKIdentity,
+                             reason => Reason}),
             error
     catch
-        Except:Error:Stacktrace ->
-          ?LOG(error, "Lookup PSK failed, ~0p: ~0p", [{Except,Error}, Stacktrace]),
+        Class:Reason:Stacktrace ->
+          ?SLOG(error, #{msg => "lookup_psk_failed",
+                         class => Class,
+                         reason => Reason,
+                         stacktrace => Stacktrace}),
           error
     end.
diff --git a/apps/emqx_psk/src/emqx_psk.erl b/apps/emqx_psk/src/emqx_psk.erl
index 9f4be11f1..cb7daa94e 100644
--- a/apps/emqx_psk/src/emqx_psk.erl
+++ b/apps/emqx_psk/src/emqx_psk.erl
@@ -88,7 +88,7 @@ unload() ->
 on_psk_lookup(PSKIdentity, _UserState) ->
     case mnesia:dirty_read(?TAB, PSKIdentity) of
         [#psk_entry{shared_secret = SharedSecret}] ->
-            {stop, SharedSecret};
+            {stop, {ok, SharedSecret}};
         _ ->
             ignore
     end.