Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs

[akkoma] / config / config.exs

diff --git a/config/config.exs b/config/config.exs
index 223ab0c52b9ad952480d0eb254477a17b40506e5..9e4ee8d02e1ecc576f649843195db6223362c0f8 100644 (file)
--- a/config/config.exs
+++ b/config/config.exs
@@ -115,7 +115,7 @@ config :logger, :console,
 config :logger, :ex_syslogger,
   level: :debug,
   ident: "Pleroma",
-  format: "$date $time $metadata[$level] $message",
+  format: "$metadata[$level] $message",
   metadata: [:request_id]
 
 config :mime, :types, %{
@@ -240,7 +240,7 @@ config :pleroma, :mrf_simple,
 
 config :pleroma, :mrf_keyword,
   reject: [],
-  ftl_removal: [],
+  federated_timeline_removal: [],
   replace: []
 
 config :pleroma, :rich_media, enabled: true
@@ -330,14 +330,16 @@ config :pleroma, Pleroma.User,
     "web"
   ]
 
-config :pleroma, Pleroma.Web.Federator, max_jobs: 50
-
 config :pleroma, Pleroma.Web.Federator.RetryQueue,
   enabled: false,
   max_jobs: 20,
   initial_timeout: 30,
   max_retries: 5
 
+config :pleroma, Pleroma.Jobs,
+  federator_incoming: [max_jobs: 50],
+  federator_outgoing: [max_jobs: 50]
+
 # Import environment specific config. This must remain at the bottom
 # of this file so it overrides the configuration defined above.
 import_config "#{Mix.env()}.exs"