Merge branch 'fix/mix-task-logging' into 'develop'

Allow mix tasks to always run with debug logging

See merge request pleroma/pleroma!1997

diff --git a/config/config.exs b/config/config.exs
index bf2b3f6e28379208e57eae5e1bdc367402feec0e..1e36d3314bfdd8d9eed0381d6afd62d5120bf00b 100644 (file)
--- a/config/config.exs
+++ b/config/config.exs
@@ -180,7 +180,8 @@ config :pleroma, Pleroma.Web.Endpoint,
 
 # Configures Elixir's Logger
 config :logger, :console,
-  format: "$time $metadata[$level] $message\n",
+  level: :debug,
+  format: "\n$time $metadata[$level] $message\n",
   metadata: [:request_id]
 
 config :logger, :ex_syslogger,

diff --git a/config/prod.exs b/config/prod.exs
index 9c205cbd2f02cde66445e94235a807413dcf70e0..301d2b9cb9c361fc267100d383160a91b2f588ac 100644 (file)
--- a/config/prod.exs
+++ b/config/prod.exs
@@ -20,7 +20,7 @@ config :pleroma, Pleroma.Web.Endpoint,
 config :phoenix, serve_endpoints: true
 
 # Do not print debug messages in production
-config :logger, level: :warn
+config :logger, :console, level: :warn
 
 # ## SSL Support
 #

diff --git a/config/test.exs b/config/test.exs
index da2778aa749ef6b32052f0bce6ae06f91b72eb47..9b737d4d7e3960588d74819f8e2fa423d3077d72 100644 (file)
--- a/config/test.exs
+++ b/config/test.exs
@@ -15,7 +15,9 @@ config :pleroma, Pleroma.Captcha,
   method: Pleroma.Captcha.Mock
 
 # Print only warnings and errors during test
-config :logger, level: :warn
+config :logger, :console,
+  level: :warn,
+  format: "\n[$level] $message\n"
 
 config :pleroma, :auth, oauth_consumer_strategies: []
 

diff --git a/lib/mix/pleroma.ex b/lib/mix/pleroma.ex
index faeb30e1dc378da65b601ce01f4deb537056a2e6..73a076a531a6ee7fc9963488f6a6ff5804029340 100644 (file)
--- a/lib/mix/pleroma.ex
+++ b/lib/mix/pleroma.ex
@@ -6,6 +6,11 @@ defmodule Mix.Pleroma do
   @doc "Common functions to be reused in mix tasks"
   def start_pleroma do
     Application.put_env(:phoenix, :serve_endpoints, false, persistent: true)
+
+    if Pleroma.Config.get(:env) != :test do
+      Application.put_env(:logger, :console, level: :debug)
+    end
+
     {:ok, _} = Application.ensure_all_started(:pleroma)
   end
 

diff --git a/lib/pleroma/object.ex b/lib/pleroma/object.ex
index d9b41d710cebb6296a3b2d4cb41521feb2c27030..cde0eddd9e8d72267f4522d5c825d87a50db1a23 100644 (file)
--- a/lib/pleroma/object.ex
+++ b/lib/pleroma/object.ex
@@ -63,7 +63,7 @@ defmodule Pleroma.Object do
   end
 
   defp warn_on_no_object_preloaded(ap_id) do
-    "Object.normalize() called without preloaded object (#{ap_id}). Consider preloading the object"
+    "Object.normalize() called without preloaded object (#{inspect(ap_id)}). Consider preloading the object"
     |> Logger.debug()
 
     Logger.debug("Backtrace: #{inspect(Process.info(:erlang.self(), :current_stacktrace))}")