Merge branch 'runtime-fixes' into 'develop'

Various runtime configuration fixes

See merge request pleroma/pleroma!468

diff --cc lib/pleroma/application.ex
index 707200737476da076a74c75b93d8670184757f5e,4c0e3ddb0ac8b99520cf6c0d9e07facbfb29379a..30f0b14c8e67dadd120356632a8bf900c959c990
--- 1/lib/pleroma/application.ex
--- 2/lib/pleroma/application.ex
+++ b/lib/pleroma/application.ex
@@@ -57,11 -58,10 +58,11 @@@ defmodule Pleroma.Application d
            id: :cachex_idem
          ),
          worker(Pleroma.Web.Federator, []),
 -        worker(Pleroma.Stats, []),
 -        worker(Pleroma.Gopher.Server, [])
 +        worker(Pleroma.Web.Federator.RetryQueue, []),
 +        worker(Pleroma.Gopher.Server, []),
 +        worker(Pleroma.Stats, [])
        ] ++
-         if Mix.env() == :test,
+         if @env == :test,
            do: [],
            else:
              [worker(Pleroma.Web.Streamer, [])] ++

diff --cc lib/pleroma/web/federator/federator.ex
Simple merge