logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma git clone https://hacktivis.me/git/pleroma.git
commit: 03e54aaba9d2d7cd7f4329f53a80f10ac71ab64d
parent bd4d2e1d83759dd987863cc17c403817a9bf462a
Author: Haelwenn <contact+git.pleroma.social@hacktivis.me>
Date:   Sat, 24 Feb 2024 11:37:34 +0000

Merge branch 'remote-fetcher-error' into 'develop'

RemoteFetcherWorker: Make sure {:error, _} is returned on failure

See merge request pleroma/pleroma!4077

Diffstat:

Achangelog.d/remote-fetcher-error.skip0
Mlib/pleroma/workers/remote_fetcher_worker.ex7+++++--
2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/changelog.d/remote-fetcher-error.skip b/changelog.d/remote-fetcher-error.skip diff --git a/lib/pleroma/workers/remote_fetcher_worker.ex b/lib/pleroma/workers/remote_fetcher_worker.ex @@ -22,8 +22,11 @@ defmodule Pleroma.Workers.RemoteFetcherWorker do {:error, :allowed_depth} -> {:discard, :allowed_depth} - _ -> - :error + {:error, _} = e -> + e + + e -> + {:error, e} end end