From: kaniini <nenolod@gmail.com>
Date: Tue, 20 Nov 2018 22:25:35 +0000 (+0000)
Subject: Merge branch 'runtime-fixes' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=a591a044a9c4e0bef1190d7895c8aba11a4cd476;p=akkoma

Merge branch 'runtime-fixes' into 'develop'

Various runtime configuration fixes

See merge request pleroma/pleroma!468
---

a591a044a9c4e0bef1190d7895c8aba11a4cd476
diff --cc lib/pleroma/application.ex
index 707200737,4c0e3ddb0..30f0b14c8
--- a/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, [])] ++