diff options
| author | lain <lain@soykaf.club> | 2020-03-30 14:48:00 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-03-30 14:48:00 +0000 |
| commit | 8bd5ad8664479b722e6905306f6342f35e2a84d2 (patch) | |
| tree | cc44801c5826eb663b87ce0b77a3a77b46c6011c /lib | |
| parent | dabe3aeb9eedf4c376a4a9d46246a3f1e76c943f (diff) | |
| parent | 96e279655763fedcb701e59c500023a70568c4c6 (diff) | |
| download | pleroma-8bd5ad8664479b722e6905306f6342f35e2a84d2.tar.gz | |
Merge branch 'benchmark-improvements' into 'develop'
Benchmark improvements
See merge request pleroma/pleroma!2308
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/mix/pleroma.ex | 1 | ||||
| -rw-r--r-- | lib/pleroma/application.ex | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/mix/pleroma.ex b/lib/mix/pleroma.ex index 3ad6edbfb..4dfcc32e7 100644 --- a/lib/mix/pleroma.ex +++ b/lib/mix/pleroma.ex @@ -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 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()] |