Merge branch 'benchmark-improvements' into 'develop'

Benchmark improvements

See merge request pleroma/pleroma!2308
This commit is contained in:
lain 2020-03-30 14:48:00 +00:00
commit 8bd5ad8664
11 changed files with 1258 additions and 791 deletions

View file

@ -5,6 +5,7 @@
defmodule Mix.Pleroma do
@doc "Common functions to be reused in mix tasks"
def start_pleroma do
Mix.Task.run("app.start")
Application.put_env(:phoenix, :serve_endpoints, false, persistent: true)
if Pleroma.Config.get(:env) != :test do

View file

@ -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()]