don't migrate Pleroma.Web.EndPoint settings

don't set Logger level to all tasks

diff --git a/lib/mix/pleroma.ex b/lib/mix/pleroma.ex
index 73a076a531a6ee7fc9963488f6a6ff5804029340..ea99234405ed77582be617cd629d703d95ae5147 100644 (file)
--- a/lib/mix/pleroma.ex
+++ b/lib/mix/pleroma.ex
@@ -4,11 +4,12 @@
 
 defmodule Mix.Pleroma do
   @doc "Common functions to be reused in mix tasks"
-  def start_pleroma do
+  def start_pleroma(change_logger_level \\ true) do
     Application.put_env(:phoenix, :serve_endpoints, false, persistent: true)
 
-    if Pleroma.Config.get(:env) != :test do
-      Application.put_env(:logger, :console, level: :debug)
+    if Pleroma.Config.get(:env) != :test and change_logger_level do
+      require Logger
+      Logger.configure(level: :debug)
     end
 
     {:ok, _} = Application.ensure_all_started(:pleroma)

diff --git a/lib/mix/tasks/pleroma/config.ex b/lib/mix/tasks/pleroma/config.ex
index b69c49b4540a6c4b504281c246a922e9fa8773fa..92487dd5123d669d507ec3c9c10629a461c4f516 100644 (file)
--- a/lib/mix/tasks/pleroma/config.ex
+++ b/lib/mix/tasks/pleroma/config.ex
@@ -27,7 +27,8 @@ defmodule Mix.Tasks.Pleroma.Config do
   ]
 
   def run(["migrate_to_db"]) do
-    start_pleroma()
+    # we want to save original logger level
+    start_pleroma(false)
 
     if Pleroma.Config.get([:configurable_from_database]) do
       Enum.each(@groups, &load_and_create(&1))
@@ -75,7 +76,7 @@ defmodule Mix.Tasks.Pleroma.Config do
     group
     |> Application.get_all_env()
     |> Enum.reject(fn {k, _v} ->
-      k in [Pleroma.Repo, :env, :configurable_from_database] or
+      k in [Pleroma.Repo, Pleroma.Web.Endpoint, :env, :configurable_from_database] or
         (group == :phoenix and k == :serve_endpoints)
     end)
     |> Enum.each(fn {key, value} ->