Merge branch 'hotfix/hellthread-deprecation-warning' into 'develop'

fix hellthread threshold deprecation warning

See merge request pleroma/pleroma!770
This commit is contained in:
rinpatch 2019-02-04 17:32:12 +00:00
commit 3ae11835a9

View File

@ -12,8 +12,10 @@ def check_frontend_config_mechanism() do
You are using the old configuration mechanism for the frontend. Please check config.md. You are using the old configuration mechanism for the frontend. Please check config.md.
""") """)
end end
end
if Pleroma.Config.get(:mrf_hellthread, :threshold) do def check_hellthread_threshold do
if Pleroma.Config.get([:mrf_hellthread, :threshold]) do
Logger.warn(""" Logger.warn("""
!!!DEPRECATION WARNING!!! !!!DEPRECATION WARNING!!!
You are using the old configuration mechanism for the hellthread filter. Please check config.md. You are using the old configuration mechanism for the hellthread filter. Please check config.md.
@ -23,5 +25,6 @@ def check_frontend_config_mechanism() do
def warn do def warn do
check_frontend_config_mechanism() check_frontend_config_mechanism()
check_hellthread_threshold()
end end
end end