pleroma

commit: d5330ed12561377e5c464bcc2774ebc692b9ac07
parent cb89987ca1c473e837005191ea23a9bdf45fa3bf
Author: kaniini <nenolod@gmail.com>
Date:   Fri,  7 Jun 2019 10:58:09 +0000

Merge branch 'fix/replace-mix-env' into 'develop'

Replace Mix.env with Pleroma.Config.get(:env)

See merge request pleroma/pleroma!1254
Diffstat:
M
config/config.exs
2
++
M
lib/pleroma/application.ex
2
+-
M
lib/pleroma/plugs/http_security_plug.ex
4
++--
M
lib/pleroma/web/federator/retry_queue.ex
6
++++--
M
lib/pleroma/web/rel_me.ex
2
+-
M
lib/pleroma/web/rich_media/parser.ex
2
+-
M
lib/pleroma/web/router.ex
2
+-
M
lib/pleroma/web/views/error_view.ex
2
+-

8 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/config/config.exs b/config/config.exs
@@ -500,6 +500,8 @@ config :pleroma, :oauth2,
 
 config :pleroma, :database, rum_enabled: false
 
+config :pleroma, :env, Mix.env()
+
 config :http_signatures,
   adapter: Pleroma.Signature
 
diff --git a/lib/pleroma/application.ex b/lib/pleroma/application.ex
@@ -194,7 +194,7 @@ defmodule Pleroma.Application do
       end
   end
 
-  if Mix.env() == :test do
+  if Pleroma.Config.get(:env) == :test do
     defp streamer_child, do: []
     defp chat_child, do: []
   else
diff --git a/lib/pleroma/plugs/http_security_plug.ex b/lib/pleroma/plugs/http_security_plug.ex
@@ -56,14 +56,14 @@ defmodule Pleroma.Plugs.HTTPSecurityPlug do
     connect_src = "connect-src 'self' #{static_url} #{websocket_url}"
 
     connect_src =
-      if Mix.env() == :dev do
+      if Pleroma.Config.get(:env) == :dev do
         connect_src <> " http://localhost:3035/"
       else
         connect_src
       end
 
     script_src =
-      if Mix.env() == :dev do
+      if Pleroma.Config.get(:env) == :dev do
         "script-src 'self' 'unsafe-eval'"
       else
         "script-src 'self'"
diff --git a/lib/pleroma/web/federator/retry_queue.ex b/lib/pleroma/web/federator/retry_queue.ex
@@ -15,7 +15,9 @@ defmodule Pleroma.Web.Federator.RetryQueue do
 
   def start_link do
     enabled =
-      if Mix.env() == :test, do: true, else: Pleroma.Config.get([__MODULE__, :enabled], false)
+      if Pleroma.Config.get(:env) == :test,
+        do: true,
+        else: Pleroma.Config.get([__MODULE__, :enabled], false)
 
     if enabled do
       Logger.info("Starting retry queue")
@@ -219,7 +221,7 @@ defmodule Pleroma.Web.Federator.RetryQueue do
     {:noreply, state}
   end
 
-  if Mix.env() == :test do
+  if Pleroma.Config.get(:env) == :test do
     defp growth_function(_retries) do
       _shutit = Pleroma.Config.get([__MODULE__, :initial_timeout])
       DateTime.to_unix(DateTime.utc_now()) - 1
diff --git a/lib/pleroma/web/rel_me.ex b/lib/pleroma/web/rel_me.ex
@@ -10,7 +10,7 @@ defmodule Pleroma.Web.RelMe do
     with_body: true
   ]
 
-  if Mix.env() == :test do
+  if Pleroma.Config.get(:env) == :test do
     def parse(url) when is_binary(url), do: parse_url(url)
   else
     def parse(url) when is_binary(url) do
diff --git a/lib/pleroma/web/rich_media/parser.ex b/lib/pleroma/web/rich_media/parser.ex
@@ -18,7 +18,7 @@ defmodule Pleroma.Web.RichMedia.Parser do
 
   def parse(nil), do: {:error, "No URL provided"}
 
-  if Mix.env() == :test do
+  if Pleroma.Config.get(:env) == :test do
     def parse(url), do: parse_url(url)
   else
     def parse(url) do
diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex
@@ -699,7 +699,7 @@ defmodule Pleroma.Web.Router do
     get("/:sig/:url/:filename", MediaProxyController, :remote)
   end
 
-  if Mix.env() == :dev do
+  if Pleroma.Config.get(:env) == :dev do
     scope "/dev" do
       pipe_through([:mailbox_preview])
 
diff --git a/lib/pleroma/web/views/error_view.ex b/lib/pleroma/web/views/error_view.ex
@@ -13,7 +13,7 @@ defmodule Pleroma.Web.ErrorView do
   def render("500.json", assigns) do
     Logger.error("Internal server error: #{inspect(assigns[:reason])}")
 
-    if Mix.env() != :prod do
+    if Pleroma.Config.get(:env) != :prod do
       %{errors: %{detail: "Internal server error", reason: inspect(assigns[:reason])}}
     else
       %{errors: %{detail: "Internal server error"}}