diff options
author | lain <lain@soykaf.club> | 2020-09-02 17:09:55 +0000 |
---|---|---|
committer | lain <lain@soykaf.club> | 2020-09-02 17:09:55 +0000 |
commit | 0ab03e856480c35ce9478d086f103b396a8e7453 (patch) | |
tree | 5c6c9f274de1e440d9374b9f5319ad59c46cd668 | |
parent | 119e11f455e59bcc5ae890c24bb0fd711f660ed1 (diff) | |
parent | a11f23c130331d98db941c3edcc4d2dcf139bbc6 (diff) | |
download | pleroma-0ab03e856480c35ce9478d086f103b396a8e7453.tar.gz |
Merge branch 'fix/1991-tzdata-update' into 'develop'
user agent if Endpoint is not started yet
Closes #1991
See merge request pleroma/pleroma!2945
-rw-r--r-- | lib/pleroma/application.ex | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/lib/pleroma/application.ex b/lib/pleroma/application.ex index 005aba50a..33b1e3872 100644 --- a/lib/pleroma/application.ex +++ b/lib/pleroma/application.ex @@ -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 |