aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2020-03-30 14:48:00 +0000
committerlain <lain@soykaf.club>2020-03-30 14:48:00 +0000
commit8bd5ad8664479b722e6905306f6342f35e2a84d2 (patch)
treecc44801c5826eb663b87ce0b77a3a77b46c6011c /lib/pleroma
parentdabe3aeb9eedf4c376a4a9d46246a3f1e76c943f (diff)
parent96e279655763fedcb701e59c500023a70568c4c6 (diff)
downloadpleroma-8bd5ad8664479b722e6905306f6342f35e2a84d2.tar.gz
Merge branch 'benchmark-improvements' into 'develop'
Benchmark improvements See merge request pleroma/pleroma!2308
Diffstat (limited to 'lib/pleroma')
-rw-r--r--lib/pleroma/application.ex2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/application.ex b/lib/pleroma/application.ex
index 33f1705df..51850abb5 100644
--- a/lib/pleroma/application.ex
+++ b/lib/pleroma/application.ex
@@ -157,7 +157,7 @@ defmodule Pleroma.Application do
defp chat_enabled?, do: Pleroma.Config.get([:chat, :enabled])
- defp streamer_child(:test), do: []
+ defp streamer_child(env) when env in [:test, :benchmark], do: []
defp streamer_child(_) do
[Pleroma.Web.Streamer.supervisor()]