Verified Commit fce090c1 authored by Alexander Strizhakov's avatar Alexander Strizhakov
Browse files

using Pleroma.Config instead of ets

parent 193d67cd
Pipeline #23590 passed with stages
in 3 minutes and 45 seconds
...@@ -31,7 +31,7 @@ def user_agent do ...@@ -31,7 +31,7 @@ def user_agent do
# See http://elixir-lang.org/docs/stable/elixir/Application.html # See http://elixir-lang.org/docs/stable/elixir/Application.html
# for more information on OTP Applications # for more information on OTP Applications
def start(_type, _args) do def start(_type, _args) do
Pleroma.Config.Holder.to_ets() Pleroma.Config.Holder.save_default()
Pleroma.HTML.compile_scrubbers() Pleroma.HTML.compile_scrubbers()
Pleroma.Config.DeprecationWarnings.warn() Pleroma.Config.DeprecationWarnings.warn()
Pleroma.Plugs.HTTPSecurityPlug.warn_if_disabled() Pleroma.Plugs.HTTPSecurityPlug.warn_if_disabled()
......
...@@ -5,10 +5,8 @@ ...@@ -5,10 +5,8 @@
defmodule Pleroma.Config.Holder do defmodule Pleroma.Config.Holder do
@config Pleroma.Config.Loader.default_config() @config Pleroma.Config.Loader.default_config()
@spec to_ets() :: true @spec save_default() :: :ok
def to_ets do def save_default do
:ets.new(:default_config, [:named_table, :protected])
default_config = default_config =
if System.get_env("RELEASE_NAME") do if System.get_env("RELEASE_NAME") do
release_config = release_config =
...@@ -21,20 +19,17 @@ def to_ets do ...@@ -21,20 +19,17 @@ def to_ets do
@config @config
end end
:ets.insert(:default_config, {:config, default_config}) Pleroma.Config.put(:default_config, default_config)
end end
@spec default_config() :: keyword() @spec default_config() :: keyword()
def default_config, do: from_ets() def default_config, do: get_default()
@spec default_config(atom()) :: keyword() @spec default_config(atom()) :: keyword()
def default_config(group), do: Keyword.get(from_ets(), group) def default_config(group), do: Keyword.get(get_default(), group)
@spec default_config(atom(), atom()) :: keyword() @spec default_config(atom(), atom()) :: keyword()
def default_config(group, key), do: get_in(from_ets(), [group, key]) def default_config(group, key), do: get_in(get_default(), [group, key])
defp from_ets do defp get_default, do: Pleroma.Config.get(:default_config)
[{:config, default_config}] = :ets.lookup(:default_config, :config)
default_config
end
end end
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment