mirror of
https://git.youjo.love/youjo/youjo-be.git
synced 2025-03-28 21:51:47 +01:00
tries to start akkoma twice + fix shoutbox
This commit is contained in:
parent
af0b91ba51
commit
8cec9a11e9
1 changed files with 3 additions and 1 deletions
|
@ -94,7 +94,6 @@ defmodule Pleroma.Application do
|
||||||
end
|
end
|
||||||
|
|
||||||
opts = [strategy: :one_for_one, name: Pleroma.Supervisor, max_restarts: max_restarts]
|
opts = [strategy: :one_for_one, name: Pleroma.Supervisor, max_restarts: max_restarts]
|
||||||
result = Supervisor.start_link(children, opts)
|
|
||||||
|
|
||||||
with {:ok, data} <- Supervisor.start_link(children, opts) do
|
with {:ok, data} <- Supervisor.start_link(children, opts) do
|
||||||
set_postgres_server_version()
|
set_postgres_server_version()
|
||||||
|
@ -212,12 +211,15 @@ defmodule Pleroma.Application do
|
||||||
end
|
end
|
||||||
|
|
||||||
@spec task_children(atom()) :: [map()]
|
@spec task_children(atom()) :: [map()]
|
||||||
|
|
||||||
defp shout_child(true) do
|
defp shout_child(true) do
|
||||||
[
|
[
|
||||||
Pleroma.Web.ShoutChannel.ShoutChannelState,
|
Pleroma.Web.ShoutChannel.ShoutChannelState,
|
||||||
{Phoenix.PubSub, [name: Pleroma.PubSub, adapter: Phoenix.PubSub.PG2]}
|
{Phoenix.PubSub, [name: Pleroma.PubSub, adapter: Phoenix.PubSub.PG2]}
|
||||||
]
|
]
|
||||||
end
|
end
|
||||||
|
|
||||||
|
defp shout_child(_), do: []
|
||||||
|
|
||||||
defp task_children(:test) do
|
defp task_children(:test) do
|
||||||
[
|
[
|
||||||
|
|
Loading…
Reference in a new issue