summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorfeld <feld@feld.me>2024-05-27 17:53:33 +0000
committerfeld <feld@feld.me>2024-05-27 17:53:33 +0000
commit42150d5581d221658877aecd21efcead9bc41c9d (patch)
treea1379b1debf47ffd7edae2f8cdfb92a1f9320c6f /config
parentb1fec8594d020b3f78d60d0a47f4ebf2806547fb (diff)
parent29eac86dc0bb246e983afe4209332194bf11bed0 (diff)
downloadpleroma-42150d5581d221658877aecd21efcead9bc41c9d.tar.gz
pleroma-42150d5581d221658877aecd21efcead9bc41c9d.zip
Merge branch 'logger-metadata' into 'develop'
Logger metadata See merge request pleroma/pleroma!3990
Diffstat (limited to 'config')
-rw-r--r--config/config.exs4
-rw-r--r--config/dev.exs4
2 files changed, 4 insertions, 4 deletions
diff --git a/config/config.exs b/config/config.exs
index 4752bbbde..9ba494b26 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -135,13 +135,13 @@ config :pleroma, Pleroma.Web.Endpoint,
config :logger, :console,
level: :debug,
format: "\n$time $metadata[$level] $message\n",
- metadata: [:request_id]
+ metadata: [:actor, :path, :type, :user]
config :logger, :ex_syslogger,
level: :debug,
ident: "pleroma",
format: "$metadata[$level] $message",
- metadata: [:request_id]
+ metadata: [:actor, :path, :type, :user]
config :mime, :types, %{
"application/xml" => ["xml"],
diff --git a/config/dev.exs b/config/dev.exs
index fe8de5045..f23719fe3 100644
--- a/config/dev.exs
+++ b/config/dev.exs
@@ -35,8 +35,8 @@ config :pleroma, Pleroma.Emails.Mailer, adapter: Swoosh.Adapters.Local
# configured to run both http and https servers on
# different ports.
-# Do not include metadata nor timestamps in development logs
-config :logger, :console, format: "[$level] $message\n"
+# Do not include timestamps in development logs
+config :logger, :console, format: "$metadata[$level] $message\n"
# Set a higher stacktrace during development. Avoid configuring such
# in production as building large stacktraces may be expensive.