Sfoglia il codice sorgente

fix: reduce duplicate field

EMQ-YangM 3 anni fa
parent
commit
110f0d0e94
1 ha cambiato i file con 11 aggiunte e 10 eliminazioni
  1. 11 10
      apps/emqx_authz/src/emqx_authz_schema.erl

+ 11 - 10
apps/emqx_authz/src/emqx_authz_schema.erl

@@ -167,11 +167,8 @@ fields("metrics") ->
         {"matched", mk(integer(), #{desc => ?DESC("matched")})},
         {"matched", mk(integer(), #{desc => ?DESC("matched")})},
         {"allow", mk(integer(), #{desc => ?DESC("allow")})},
         {"allow", mk(integer(), #{desc => ?DESC("allow")})},
         {"deny", mk(integer(), #{desc => ?DESC("deny")})},
         {"deny", mk(integer(), #{desc => ?DESC("deny")})},
-        {"ignore", mk(float(), #{desc => ?DESC("ignore")})},
-        {"rate", mk(float(), #{desc => ?DESC("rate")})},
-        {"rate_max", mk(float(), #{desc => ?DESC("rate_max")})},
-        {"rate_last5m", mk(float(), #{desc => ?DESC("rate_last5m")})}
-    ];
+        {"ignore", mk(float(), #{desc => ?DESC("ignore")})}
+    ] ++ common_rate_field();
 fields("node_metrics") ->
 fields("node_metrics") ->
     [
     [
         node_name(),
         node_name(),
@@ -199,11 +196,8 @@ common_field() ->
     [
     [
         {"matched", mk(integer(), #{desc => ?DESC("matched")})},
         {"matched", mk(integer(), #{desc => ?DESC("matched")})},
         {"success", mk(integer(), #{desc => ?DESC("success")})},
         {"success", mk(integer(), #{desc => ?DESC("success")})},
-        {"failed", mk(integer(), #{desc => ?DESC("failed")})},
-        {"rate", mk(float(), #{desc => ?DESC("rate")})},
-        {"rate_max", mk(float(), #{desc => ?DESC("rate_max")})},
-        {"rate_last5m", mk(float(), #{desc => ?DESC("rate_last5m")})}
-    ].
+        {"failed", mk(integer(), #{desc => ?DESC("failed")})}
+    ] ++ common_rate_field().
 
 
 status() ->
 status() ->
     hoconsc:enum([connected, disconnected, connecting]).
     hoconsc:enum([connected, disconnected, connecting]).
@@ -424,3 +418,10 @@ to_list(A) when is_atom(A) ->
     atom_to_list(A);
     atom_to_list(A);
 to_list(B) when is_binary(B) ->
 to_list(B) when is_binary(B) ->
     binary_to_list(B).
     binary_to_list(B).
+
+common_rate_field() ->
+    [
+        {"rate", mk(float(), #{desc => ?DESC("rate")})},
+        {"rate_max", mk(float(), #{desc => ?DESC("rate_max")})},
+        {"rate_last5m", mk(float(), #{desc => ?DESC("rate_last5m")})}
+    ].