limepotato/akkoma
1
0
Fork 0
Code Pull requests Activity

No need for a separate functions here

Browse source
This commit is contained in:
Mark Felder 2020-12-02 13:00:07 -06:00
parent 13947999ad
commit 25fab7da69
1 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
lib/mix/tasks/pleroma/config.ex
View file

@ -184,7 +184,8 @@ defmodule Mix.Tasks.Pleroma.Config do
do_migrate_to_db(config_file) do_migrate_to_db(config_file)
else else
_ -> deprecation_error() _ ->
shell_error("Migration is not allowed until all deprecation warnings have been resolved.")
end end
end end
@ -248,10 +249,6 @@ defmodule Mix.Tasks.Pleroma.Config do
) )
end end
defp deprecation_error do
shell_error("Migration is not allowed until all deprecation warnings have been resolved.")
end
if Code.ensure_loaded?(Config.Reader) do if Code.ensure_loaded?(Config.Reader) do
defp config_header, do: "import Config\r\n\r\n" defp config_header, do: "import Config\r\n\r\n"
defp read_file(config_file), do: Config.Reader.read_imports!(config_file) defp read_file(config_file), do: Config.Reader.read_imports!(config_file)
@ -290,12 +287,6 @@ defmodule Mix.Tasks.Pleroma.Config do
shell_info("config #{inspect(config.group)}, #{inspect(config.key)}, #{value}\r\n\r\n") shell_info("config #{inspect(config.group)}, #{inspect(config.key)}, #{value}\r\n\r\n")
end end
defp configdb_not_enabled do
shell_error(
"ConfigDB not enabled. Please check the value of :configurable_from_database in your configuration."
)
end
defp dump_key(group, key) when is_atom(group) and is_atom(key) do defp dump_key(group, key) when is_atom(group) and is_atom(key) do
ConfigDB ConfigDB
|> Repo.all() |> Repo.all()
@ -349,7 +340,10 @@ defmodule Mix.Tasks.Pleroma.Config do
with true <- Pleroma.Config.get([:configurable_from_database]) do with true <- Pleroma.Config.get([:configurable_from_database]) do
callback.() callback.()
else else
_ -> configdb_not_enabled() _ ->
shell_error(
"ConfigDB not enabled. Please check the value of :configurable_from_database in your configuration."
)
end end
end end
end end