mirror of
https://git.pleroma.social/pleroma/pleroma.git
synced 2024-12-23 08:36:29 +00:00
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:
commit
0ab03e8564
1 changed files with 11 additions and 6 deletions
|
@ -22,6 +22,7 @@ defmodule Pleroma.Application do
|
|||
def repository, do: @repository
|
||||
|
||||
def user_agent do
|
||||
if Process.whereis(Pleroma.Web.Endpoint) do
|
||||
case Config.get([:http, :user_agent], :default) do
|
||||
:default ->
|
||||
info = "#{Pleroma.Web.base_url()} <#{Config.get([:instance, :email], "")}>"
|
||||
|
@ -30,6 +31,10 @@ defmodule Pleroma.Application do
|
|||
custom ->
|
||||
custom
|
||||
end
|
||||
else
|
||||
# fallback, if endpoint is not started yet
|
||||
"Pleroma Data Loader"
|
||||
end
|
||||
end
|
||||
|
||||
# See http://elixir-lang.org/docs/stable/elixir/Application.html
|
||||
|
|
Loading…
Reference in a new issue