logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma
commit: 0ab03e856480c35ce9478d086f103b396a8e7453
parent: 119e11f455e59bcc5ae890c24bb0fd711f660ed1
Author: lain <lain@soykaf.club>
Date:   Wed,  2 Sep 2020 17:09:55 +0000

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

user agent if Endpoint is not started yet

Closes #1991

See merge request pleroma/pleroma!2945

Diffstat:

Mlib/pleroma/application.ex19++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)

diff --git 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