moon
/
spc-pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

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
parent 119e11f455 a11f23c130
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 @@ def named_version, do: @name <> " " <> @version
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 @@ def user_agent 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