summaryrefslogtreecommitdiff
path: root/config/config.exs
diff options
context:
space:
mode:
authorkaniini <nenolod@gmail.com>2019-02-18 19:43:06 +0000
committerkaniini <nenolod@gmail.com>2019-02-18 19:43:06 +0000
commit833161b5d21f85e2276cd0cee3e148ecbe6e1f05 (patch)
tree2f3158e266330000e25dc6a99e5b31845505a992 /config/config.exs
parenta39a094cdabe9c2497fbd5cc4947650aff933c0d (diff)
parent3f32d7b937a2368707794b55d1256bfa9fa508f4 (diff)
downloadpleroma-833161b5d21f85e2276cd0cee3e148ecbe6e1f05.tar.gz
pleroma-833161b5d21f85e2276cd0cee3e148ecbe6e1f05.zip
Merge branch 'feature/jobs' into 'develop'
Job Queue See merge request pleroma/pleroma!732
Diffstat (limited to 'config/config.exs')
-rw-r--r--config/config.exs6
1 files changed, 4 insertions, 2 deletions
diff --git a/config/config.exs b/config/config.exs
index 271224e85..317299bf1 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -332,14 +332,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"