hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

tests for release config provider

Browse source
This commit is contained in:
Alexander Strizhakov 2021-03-27 09:05:33 +03:00
commit 4d046afd27
No known key found for this signature in database
GPG key ID: 022896A53AEF1381
4 changed files with 70 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

17
lib/pleroma/config/release_runtime_provider.ex
View file

@ -1,6 +1,6 @@
defmodule Pleroma.Config.ReleaseRuntimeProvider do
@moduledoc """
Imports `runtime.exs` and `{env}.exported_from_db.secret.exs` for elixir releases.
Imports runtime config and `{env}.exported_from_db.secret.exs` for releases.
"""
@behaviour Config.Provider
@ -8,13 +8,13 @@ defmodule Pleroma.Config.ReleaseRuntimeProvider do
def init(opts), do: opts
@impl true
def load(config, _opts) do
def load(config, opts) do
with_defaults = Config.Reader.merge(config, Pleroma.Config.Holder.release_defaults())
config_path = System.get_env("PLEROMA_CONFIG_PATH") || "/etc/pleroma/config.exs"
config_path = opts[:config_path]
with_runtime_config =
if File.exists?(config_path) do
if config_path && File.exists?(config_path) do
runtime_config = Config.Reader.read!(config_path)
with_defaults
@ -24,7 +24,7 @@ defmodule Pleroma.Config.ReleaseRuntimeProvider do
warning = [
IO.ANSI.red(),
IO.ANSI.bright(),
"!!! #{config_path} not found! Please ensure it exists and that PLEROMA_CONFIG_PATH is unset or points to an existing file",
"!!! Config path is not declared! Please ensure it exists and that PLEROMA_CONFIG_PATH is unset or points to an existing file",
IO.ANSI.reset()
]
@ -32,13 +32,10 @@ defmodule Pleroma.Config.ReleaseRuntimeProvider do
with_defaults
end
exported_config_path =
config_path
|> Path.dirname()
|> Path.join("prod.exported_from_db.secret.exs")
exported_config_path = opts[:exported_config_path]
with_exported =
if File.exists?(exported_config_path) do
if exported_config_path && File.exists?(exported_config_path) do
exported_config = Config.Reader.read!(exported_config_path)
Config.Reader.merge(with_runtime_config, exported_config)
else