From 964bc8e2e8c9759985abaf9b8a5e26a2c5666fea Mon Sep 17 00:00:00 2001 From: rinpatch Date: Mon, 7 Sep 2020 11:12:30 +0000 Subject: Merge branch 'bugfix/favicon-too-long' into 'develop' instance: Drop favicon URLs longer than 255 characters Closes #2116 See merge request pleroma/pleroma!2949 --- lib/pleroma/instances/instance.ex | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/pleroma/instances/instance.ex b/lib/pleroma/instances/instance.ex index 711c42158..8bf53c090 100644 --- a/lib/pleroma/instances/instance.ex +++ b/lib/pleroma/instances/instance.ex @@ -14,6 +14,8 @@ defmodule Pleroma.Instances.Instance do import Ecto.Query import Ecto.Changeset + require Logger + schema "instances" do field(:host, :string) field(:unreachable_since, :naive_datetime_usec) @@ -145,6 +147,10 @@ defmodule Pleroma.Instances.Instance do favicon end + rescue + e -> + Logger.warn("Instance.get_or_update_favicon(\"#{host}\") error: #{inspect(e)}") + nil end defp scrape_favicon(%URI{} = instance_uri) do @@ -165,7 +171,12 @@ defmodule Pleroma.Instances.Instance do _ -> nil end rescue - _ -> nil + e -> + Logger.warn( + "Instance.scrape_favicon(\"#{to_string(instance_uri)}\") error: #{inspect(e)}" + ) + + nil end end end -- cgit v1.2.3