Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Pleroma
pleroma
Commits
fce090c1
Verified
Commit
fce090c1
authored
Mar 11, 2020
by
Alexander Strizhakov
Browse files
using Pleroma.Config instead of ets
parent
193d67cd
Pipeline
#23590
passed with stages
in 3 minutes and 45 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
lib/pleroma/application.ex
View file @
fce090c1
...
...
@@ -31,7 +31,7 @@ def user_agent do
# See http://elixir-lang.org/docs/stable/elixir/Application.html
# for more information on OTP Applications
def
start
(
_type
,
_args
)
do
Pleroma
.
Config
.
Holder
.
to_ets
()
Pleroma
.
Config
.
Holder
.
save_default
()
Pleroma
.
HTML
.
compile_scrubbers
()
Pleroma
.
Config
.
DeprecationWarnings
.
warn
()
Pleroma
.
Plugs
.
HTTPSecurityPlug
.
warn_if_disabled
()
...
...
lib/pleroma/config/holder.ex
View file @
fce090c1
...
...
@@ -5,10 +5,8 @@
defmodule
Pleroma
.
Config
.
Holder
do
@config
Pleroma
.
Config
.
Loader
.
default_config
()
@spec
to_ets
()
::
true
def
to_ets
do
:ets
.
new
(
:default_config
,
[
:named_table
,
:protected
])
@spec
save_default
()
::
:ok
def
save_default
do
default_config
=
if
System
.
get_env
(
"RELEASE_NAME"
)
do
release_config
=
...
...
@@ -21,20 +19,17 @@ def to_ets do
@config
end
:ets
.
inser
t
(
:default_config
,
{
:config
,
default_config
}
)
Pleroma
.
Config
.
pu
t
(
:default_config
,
default_config
)
end
@spec
default_config
()
::
keyword
()
def
default_config
,
do
:
from_ets
()
def
default_config
,
do
:
get_default
()
@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
()
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
[{
:config
,
default_config
}]
=
:ets
.
lookup
(
:default_config
,
:config
)
default_config
end
defp
get_default
,
do
:
Pleroma
.
Config
.
get
(
:default_config
)
end
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment