diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2024-02-24 11:37:34 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2024-02-24 11:37:34 +0000 |
| commit | 03e54aaba9d2d7cd7f4329f53a80f10ac71ab64d (patch) | |
| tree | 4d495eca78d98aa664ecfdb273c5ff25ec5e86e2 | |
| parent | bd4d2e1d83759dd987863cc17c403817a9bf462a (diff) | |
| parent | 6af6a9704d2d0a04a43967805368eed419b9dc67 (diff) | |
| download | pleroma-03e54aaba9d2d7cd7f4329f53a80f10ac71ab64d.tar.gz pleroma-03e54aaba9d2d7cd7f4329f53a80f10ac71ab64d.zip | |
Merge branch 'remote-fetcher-error' into 'develop'
RemoteFetcherWorker: Make sure {:error, _} is returned on failure
See merge request pleroma/pleroma!4077
| -rw-r--r-- | changelog.d/remote-fetcher-error.skip | 0 | ||||
| -rw-r--r-- | lib/pleroma/workers/remote_fetcher_worker.ex | 7 |
2 files changed, 5 insertions, 2 deletions
diff --git a/changelog.d/remote-fetcher-error.skip b/changelog.d/remote-fetcher-error.skip new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ 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 index d526a99cb..c26418483 100644 --- 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 |