limepotato/akkoma
1
0
Fork 0
Code Pull requests Activity

Merge branch 'fix/1991-tzdata-update' into 'develop'

Browse source 
user agent if Endpoint is not started yet

Closes #1991

See merge request pleroma/pleroma!2945
This commit is contained in:
lain 2020-09-02 17:09:55 +00:00
commit 0ab03e8564
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/pleroma/application.ex
View file

@ -22,6 +22,7 @@ defmodule Pleroma.Application do
def repository, do: @repository def repository, do: @repository
def user_agent do def user_agent do
if Process.whereis(Pleroma.Web.Endpoint) do
case Config.get([:http, :user_agent], :default) do case Config.get([:http, :user_agent], :default) do
:default -> :default ->
info = "#{Pleroma.Web.base_url()} <#{Config.get([:instance, :email], "")}>" info = "#{Pleroma.Web.base_url()} <#{Config.get([:instance, :email], "")}>"
@ -30,6 +31,10 @@ defmodule Pleroma.Application do
custom -> custom ->
custom custom
end end
else
# fallback, if endpoint is not started yet
"Pleroma Data Loader"
end
end end
# See http://elixir-lang.org/docs/stable/elixir/Application.html # See http://elixir-lang.org/docs/stable/elixir/Application.html