projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into chore/elixir-1.11
[akkoma]
/
lib
/
pleroma
/
application.ex
diff --git
a/lib/pleroma/application.ex
b/lib/pleroma/application.ex
index e73d89350d35c1789e5720c591cbbe70bf6dc3fd..4b2512acd1012f6798518c98c93f706e2846bd2b 100644
(file)
--- a/
lib/pleroma/application.ex
+++ b/
lib/pleroma/application.ex
@@
-52,7
+52,7
@@
defmodule Pleroma.Application do
Pleroma.HTML.compile_scrubbers()
Pleroma.Config.Oban.warn()
Config.DeprecationWarnings.warn()
Pleroma.HTML.compile_scrubbers()
Pleroma.Config.Oban.warn()
Config.DeprecationWarnings.warn()
- Pleroma.Plugs.HTTPSecurityPlug.warn_if_disabled()
+ Pleroma.
Web.
Plugs.HTTPSecurityPlug.warn_if_disabled()
Pleroma.ApplicationRequirements.verify!()
setup_instrumenters()
load_custom_modules()
Pleroma.ApplicationRequirements.verify!()
setup_instrumenters()
load_custom_modules()
@@
-88,7
+88,7
@@
defmodule Pleroma.Application do
Pleroma.Repo,
Config.TransferTask,
Pleroma.Emoji,
Pleroma.Repo,
Config.TransferTask,
Pleroma.Emoji,
- Pleroma.Plugs.RateLimiter.Supervisor
+ Pleroma.
Web.
Plugs.RateLimiter.Supervisor
] ++
cachex_children() ++
http_children(adapter, @env) ++
] ++
cachex_children() ++
http_children(adapter, @env) ++
@@
-99,7
+99,7
@@
defmodule Pleroma.Application do
] ++
task_children(@env) ++
dont_run_in_test(@env) ++
] ++
task_children(@env) ++
dont_run_in_test(@env) ++
- chat_child(
@env,
chat_enabled?()) ++
+ chat_child(chat_enabled?()) ++
[
Pleroma.Web.Endpoint,
Pleroma.Gopher.Server
[
Pleroma.Web.Endpoint,
Pleroma.Gopher.Server
@@
-201,11
+201,14
@@
defmodule Pleroma.Application do
]
end
]
end
- defp chat_child(_env, true) do
- [Pleroma.Web.ChatChannel.ChatChannelState]
+ defp chat_child(true) do
+ [
+ Pleroma.Web.ChatChannel.ChatChannelState,
+ {Phoenix.PubSub, [name: Pleroma.PubSub, adapter: Phoenix.PubSub.PG2]}
+ ]
end
end
- defp chat_child(_
, _
), do: []
+ defp chat_child(_), do: []
defp task_children(:test) do
[
defp task_children(:test) do
[