소스 검색

fix: don't need to change audit log's level

zhongwencool 2 년 전
부모
커밋
95060302fd
3개의 변경된 파일15개의 추가작업 그리고 8개의 파일을 삭제
  1. 14 4
      apps/emqx_conf/src/emqx_conf_schema.erl
  2. 0 2
      apps/emqx_ctl/src/emqx_ctl.erl
  3. 1 2
      apps/emqx_dashboard/src/emqx_dashboard_audit.erl

+ 14 - 4
apps/emqx_conf/src/emqx_conf_schema.erl

@@ -1014,6 +1014,15 @@ fields("log_file_handler") ->
     ] ++ log_handler_common_confs(file, #{});
 fields("log_audit_handler") ->
     [
+        {"level",
+            sc(
+                log_level(),
+                #{
+                    default => info,
+                    desc => ?DESC("audit_handler_level"),
+                    importance => ?IMPORTANCE_HIDDEN
+                }
+            )},
         {"path",
             sc(
                 file(),
@@ -1048,11 +1057,12 @@ fields("log_audit_handler") ->
     ] ++
         %% Only support json
         lists:keydelete(
-            "formatter",
+            "level",
             1,
-            log_handler_common_confs(
-                file,
-                #{level => info, level_desc => "audit_handler_level"}
+            lists:keydelete(
+                "formatter",
+                1,
+                log_handler_common_confs(file, #{})
             )
         );
 fields("log_overload_kill") ->

+ 0 - 2
apps/emqx_ctl/src/emqx_ctl.erl

@@ -350,8 +350,6 @@ audit_log(Level, From, Log) ->
 
 -define(TOO_SLOW, 3000).
 
-audit_level(ok, Duration) when Duration >= ?TOO_SLOW -> warning;
-audit_level({ok, _}, Duration) when Duration >= ?TOO_SLOW -> warning;
 audit_level(ok, _Duration) -> info;
 audit_level({ok, _}, _Duration) -> info;
 audit_level(_, _) -> error.

+ 1 - 2
apps/emqx_dashboard/src/emqx_dashboard_audit.erl

@@ -43,8 +43,7 @@ from(jwt_token) -> "dashboard";
 from(api_key) -> "aip_key";
 from(_) -> "unauthorized".
 
-level(_, _Code, Duration) when Duration > 3000 -> warning;
-level(get, Code, _) when Code >= 200 andalso Code < 300 -> debug;
+level(get, _Code, _) -> debug;
 level(_, Code, _) when Code >= 200 andalso Code < 300 -> info;
 level(_, Code, _) when Code >= 300 andalso Code < 400 -> warning;
 level(_, Code, _) when Code >= 400 andalso Code < 500 -> error;