From 658ed81cfa576b1bc8cf6e9a4895fb4572476387 Mon Sep 17 00:00:00 2001
From: JianBo He <heeejianbo@163.com>
Date: Mon, 12 Apr 2021 16:01:01 +0800
Subject: [PATCH] fix(exhook): fix bad variable name

---
 apps/emqx_exhook/src/emqx_exhook_app.erl     | 4 ----
 apps/emqx_exhook/src/emqx_exhook_handler.erl | 8 ++++----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/apps/emqx_exhook/src/emqx_exhook_app.erl b/apps/emqx_exhook/src/emqx_exhook_app.erl
index 62c1903bd..79147121f 100644
--- a/apps/emqx_exhook/src/emqx_exhook_app.erl
+++ b/apps/emqx_exhook/src/emqx_exhook_app.erl
@@ -34,7 +34,6 @@
         , unload_server/1
         , unload_exhooks/0
         , init_hooks_cnter/0
-        , deinit_hooks_cnter/0
         ]).
 
 %%--------------------------------------------------------------------
@@ -57,7 +56,6 @@ start(_StartType, _StartArgs) ->
 prep_stop(State) ->
     emqx_ctl:unregister_command(exhook),
     _ = unload_exhooks(),
-    _ = deinit_hooks_cnter(),
     ok = unload_all_servers(),
     State.
 
@@ -94,5 +92,3 @@ init_hooks_cnter() ->
             ok
     end.
 
-deinit_hooks_cnter() ->
-    ets:delete(?CNTER).
diff --git a/apps/emqx_exhook/src/emqx_exhook_handler.erl b/apps/emqx_exhook/src/emqx_exhook_handler.erl
index 13c41ce6a..ed9ddb998 100644
--- a/apps/emqx_exhook/src/emqx_exhook_handler.erl
+++ b/apps/emqx_exhook/src/emqx_exhook_handler.erl
@@ -96,8 +96,8 @@ on_client_authenticate(ClientInfo, AuthResult) ->
 
     case call_fold('client.authenticate', Req,
                    fun merge_responsed_bool/2) of
-        {StopOrOk, #{result := Bool}} when is_boolean(Bool) ->
-            Result = case Bool of true -> success; _ -> not_authorized end,
+        {StopOrOk, #{result := Result0}} when is_boolean(Result0) ->
+            Result = case Result0 of true -> success; _ -> not_authorized end,
             {StopOrOk, AuthResult#{auth_result => Result, anonymous => false}};
         _ ->
             {ok, AuthResult}
@@ -116,8 +116,8 @@ on_client_check_acl(ClientInfo, PubSub, Topic, Result) ->
            },
     case call_fold('client.check_acl', Req,
                    fun merge_responsed_bool/2) of
-        {StopOrOk, #{result := Bool}} when is_boolean(Bool) ->
-            NResult = case Bool of true -> allow; _ -> deny end,
+        {StopOrOk, #{result := Result0}} when is_boolean(Result0) ->
+            NResult = case Result0 of true -> allow; _ -> deny end,
             {StopOrOk, NResult};
         _ -> {ok, Result}
     end.