summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2019-11-21 15:04:19 +0000
committerlain <lain@soykaf.club>2019-11-21 15:04:19 +0000
commit19b727bf8f54fb29b1a8258640ac59982810a351 (patch)
tree9198385422cc080bc8bb6623ed3071049cd8d2c9
parent8feb5dcb4240e92bf20cdc6896877cfa9551b61c (diff)
parent320690f7a5bf1622e25114b6ad4c0b0c5a252748 (diff)
Merge branch 'fix/mix-task-logging' into 'develop'
Allow mix tasks to always run with debug logging See merge request pleroma/pleroma!1997
-rw-r--r--config/config.exs3
-rw-r--r--config/prod.exs2
-rw-r--r--config/test.exs4
-rw-r--r--lib/mix/pleroma.ex5
-rw-r--r--lib/pleroma/object.ex2
5 files changed, 12 insertions, 4 deletions
diff --git a/config/config.exs b/config/config.exs
index bf2b3f6e2..1e36d3314 100644
--- 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 9c205cbd2..301d2b9cb 100644
--- 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 da2778aa7..9b737d4d7 100644
--- 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 faeb30e1d..73a076a53 100644
--- 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 d9b41d710..cde0eddd9 100644
--- 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))}")