No need for a separate functions here
This commit is contained in:
parent
13947999ad
commit
25fab7da69
|
@ -184,7 +184,8 @@ def migrate_to_db(file_path \\ nil) 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 @@ defp migrate_from_db(opts) 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 @@ defp dump(%Pleroma.ConfigDB{} = 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 @@ defp check_configdb(callback) 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
|
||||||
|
|
Loading…
Reference in New Issue