Compute ANSI escaping lazily in Logger, closes #14248

elixir-lang · Feb 1, 2025 · cff55fb · cff55fb
1 parent 07afa71
commit cff55fb
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/lib/logger/lib/logger/formatter.ex b/lib/logger/lib/logger/formatter.ex
@@ -175,8 +175,7 @@ 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),
-      enabled: Keyword.get(colors, :enabled, IO.ANSI.enabled?())
+      debug: Keyword.get(colors, :debug, :cyan)
     }
   end
 
@@ -222,11 +221,13 @@ defmodule Logger.Formatter do
 
   defp format_fa(fun, arity), do: [Atom.to_string(fun), "/", Integer.to_string(arity)]
 
-  defp colorize(data, _level, %{enabled: false}, _md), do: data
-
-  defp colorize(data, level, %{enabled: true} = colors, md) do
-    color = md[:ansi_color] || Map.fetch!(colors, level)
-    [IO.ANSI.format_fragment(color, true), data | IO.ANSI.reset()]
+  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
+    end
   end
 
   @doc """

diff --git a/lib/logger/test/logger/formatter_test.exs b/lib/logger/test/logger/formatter_test.exs
@@ -64,7 +64,7 @@ defmodule Logger.FormatterTest do
         )
 
       assert %{
-               level: :warn,
+               level: :warning,
                msg: {:string, "foo"},
                meta: %{
                  mfa: {Logger.Formatter, :compile, 1}
@@ -83,7 +83,7 @@ defmodule Logger.FormatterTest do
         )
 
       assert %{
-               level: :warn,
+               level: :warning,
                msg: {:string, "message"},
                meta: %{
                  mfa: {Logger.Formatter, :compile, 1},