Преглед изворни кода

fix(prom): skip cert info for disabled ssl/wss/quic listeners

JimMoen пре 1 година
родитељ
комит
6fd04e33f5
1 измењених фајлова са 7 додато и 4 уклоњено
  1. 7 4
      apps/emqx_prometheus/src/emqx_prometheus.erl

+ 7 - 4
apps/emqx_prometheus/src/emqx_prometheus.erl

@@ -856,10 +856,12 @@ do_points_of_listeners(Type, Listeners) ->
     lists:foldl(
         fun(Name, PointsAcc) ->
             case
-                emqx_utils_maps:deep_get(
-                    [Name, ssl_options, certfile], Listeners, undefined
-                )
+                emqx_utils_maps:deep_get([Name, enable], Listeners, false) andalso
+                    emqx_utils_maps:deep_get(
+                        [Name, ssl_options, certfile], Listeners, undefined
+                    )
             of
+                false -> PointsAcc;
                 undefined -> PointsAcc;
                 Path -> [gen_point_cert_expiry_at(Type, Name, Path) | PointsAcc]
             end
@@ -894,11 +896,12 @@ cert_expiry_at_from_path(Path0) ->
                 0
         end
     catch
-        E:R ->
+        E:R:S ->
             ?SLOG(error, #{
                 msg => "obtain_cert_expiry_time_failed",
                 error => E,
                 reason => R,
+                stacktrace => S,
                 path => Path0,
                 resolved_path => Path
             }),