Ensure logger suite passes when IO.ANSI colors is disabled

elixir-lang · Feb 1, 2025 · 80aad35 · 80aad35
1 parent cff55fb
commit 80aad35
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/lib/logger/lib/logger/formatter.ex b/lib/logger/lib/logger/formatter.ex
@@ -175,7 +175,8 @@ defmodule Logger.Formatter do
       warning: Keyword.get(colors, :warning, :yellow),
       notice: Keyword.get(colors, :info, :normal),
       info: Keyword.get(colors, :info, :normal),
-      debug: Keyword.get(colors, :debug, :cyan)
+      debug: Keyword.get(colors, :debug, :cyan),
+      enabled: Keyword.get(colors, :enabled, &IO.ANSI.enabled?/0)
     }
   end
 
@@ -221,12 +222,14 @@ defmodule Logger.Formatter do
 
   defp format_fa(fun, arity), do: [Atom.to_string(fun), "/", Integer.to_string(arity)]
 
-  defp colorize(data, level, colors, md) do
-    if Map.get_lazy(colors, :enabled, &IO.ANSI.enabled?/0) do
-      color = md[:ansi_color] || Map.fetch!(colors, level)
-      [IO.ANSI.format_fragment(color, true), data | IO.ANSI.reset()]
-    else
-      data
+  defp colorize(data, level, %{enabled: enabled} = colors, md) do
+    case if(is_function(enabled, 0), do: enabled.(), else: enabled) do
+      true ->
+        color = md[:ansi_color] || Map.fetch!(colors, level)
+        [IO.ANSI.format_fragment(color, true), data | IO.ANSI.reset()]
+
+      false ->
+        data
     end
   end