X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fapplication.ex;h=a00938c04e26bd294f3b425ae9eea64ed1bf10b9;hb=dbcfac11b45b367185a3b18a2db3e3fb07e8f20d;hp=55b5be488179a7aced69363a5dd4875ccdc188d5;hpb=1306b92997dc6e76e5d617d529dbc229d5aee200;p=akkoma

diff --git a/lib/pleroma/application.ex b/lib/pleroma/application.ex
index 55b5be488..a00938c04 100644
--- a/lib/pleroma/application.ex
+++ b/lib/pleroma/application.ex
@@ -35,6 +35,7 @@ defmodule Pleroma.Application do
   # See http://elixir-lang.org/docs/stable/elixir/Application.html
   # for more information on OTP Applications
   def start(_type, _args) do
+    Pleroma.Config.Holder.save_default()
     Pleroma.HTML.compile_scrubbers()
     Config.DeprecationWarnings.warn()
     Pleroma.Plugs.HTTPSecurityPlug.warn_if_disabled()
@@ -170,7 +171,7 @@ defmodule Pleroma.Application do
 
   defp chat_enabled?, do: 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()]