Browse Source

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

user agent if Endpoint is not started yet

Closes #1991

See merge request pleroma/pleroma!2945
message-debug-mode
lain 3 years ago
parent
commit
0ab03e8564
1 changed files with 12 additions and 7 deletions
  1. +12
    -7
      lib/pleroma/application.ex

+ 12
- 7
lib/pleroma/application.ex View File

@@ -22,13 +22,18 @@ defmodule Pleroma.Application do
def repository, do: @repository

def user_agent do
case Config.get([:http, :user_agent], :default) do
:default ->
info = "#{Pleroma.Web.base_url()} <#{Config.get([:instance, :email], "")}>"
named_version() <> "; " <> info

custom ->
custom
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], "")}>"
named_version() <> "; " <> info

custom ->
custom
end
else
# fallback, if endpoint is not started yet
"Pleroma Data Loader"
end
end



Loading…
Cancel
Save