mirrors/pleroma
1
0
Fork 0
mirror of https://git.pleroma.social/pleroma/pleroma.git synced 2024-05-17 17:22:40 +00:00
Code Issues Projects Releases Wiki Activity

Use config to control streamer registry

Browse source
This commit is contained in:
Mark Felder 2024-01-20 18:51:20 -05:00
parent 4bb57d4f25
commit 17877f612e
4 changed files with 20 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
config/benchmark.exs
View file

@ -80,7 +80,8 @@ IO.puts("RUM enabled: #{rum_enabled}")
config :pleroma, Pleroma.ReverseProxy.Client, Pleroma.ReverseProxy.ClientMock config :pleroma, Pleroma.ReverseProxy.Client, Pleroma.ReverseProxy.ClientMock
config :pleroma, Pleroma.Application, config :pleroma, Pleroma.Application,
background_migrators: false background_migrators: false,
streamer_registry: false
if File.exists?("./config/benchmark.secret.exs") do if File.exists?("./config/benchmark.secret.exs") do
import_config "benchmark.secret.exs" import_config "benchmark.secret.exs"

3
config/config.exs
View file

@ -908,7 +908,8 @@ config :pleroma, Pleroma.Application,
background_migrators: true, background_migrators: true,
internal_fetch: true, internal_fetch: true,
load_custom_modules: true, load_custom_modules: true,
max_restarts: 3 max_restarts: 3,
streamer_registry: true
# Import environment specific config. This must remain at the bottom # Import environment specific config. This must remain at the bottom
# of this file so it overrides the configuration defined above. # of this file so it overrides the configuration defined above.

3
config/test.exs
View file

@ -166,7 +166,8 @@ config :pleroma, Pleroma.Application,
background_migrators: false, background_migrators: false,
internal_fetch: false, internal_fetch: false,
load_custom_modules: false, load_custom_modules: false,
max_restarts: 100 max_restarts: 100,
streamer_registry: false
if File.exists?("./config/test.secret.exs") do if File.exists?("./config/test.secret.exs") do
import_config "test.secret.exs" import_config "test.secret.exs"

26
lib/pleroma/application.ex
View file

@ -107,7 +107,7 @@ defmodule Pleroma.Application do
Pleroma.Web.Endpoint Pleroma.Web.Endpoint
] ++ ] ++
task_children() ++ task_children() ++
dont_run_in_test(@mix_env) ++ streamer_registry() ++
background_migrators() ++ background_migrators() ++
shout_child(shout_enabled?()) ++ shout_child(shout_enabled?()) ++
[Pleroma.Gopher.Server] [Pleroma.Gopher.Server]
@ -209,17 +209,19 @@ defmodule Pleroma.Application do
defp shout_enabled?, do: Config.get([:shout, :enabled]) defp shout_enabled?, do: Config.get([:shout, :enabled])
defp dont_run_in_test(env) when env in [:test, :benchmark], do: [] defp streamer_registry() do
if Application.get_env(:pleroma, __MODULE__)[:streamer_registry] do
defp dont_run_in_test(_) do [
[ {Registry,
{Registry, [
[ name: Pleroma.Web.Streamer.registry(),
name: Pleroma.Web.Streamer.registry(), keys: :duplicate,
keys: :duplicate, partitions: System.schedulers_online()
partitions: System.schedulers_online() ]}
]} ]
] else
[]
end
end end
defp background_migrators do defp background_migrators do