diff options
| author | lain <lain@soykaf.club> | 2024-04-19 06:04:44 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2024-04-19 06:04:44 +0000 |
| commit | 87b8ac3ce6bbbeb0ab65ca41e47f09f2d66f2f25 (patch) | |
| tree | a6bcce2a3e2b2ceabd9c03f2bf5ffaa3a0612d75 /lib | |
| parent | 71a03732327409fca07c83da35e372307223f515 (diff) | |
| parent | a299ddb10e5b682194710d97eed541277c9d22b6 (diff) | |
| download | pleroma-87b8ac3ce6bbbeb0ab65ca41e47f09f2d66f2f25.tar.gz pleroma-87b8ac3ce6bbbeb0ab65ca41e47f09f2d66f2f25.zip | |
Merge branch 'receiverworker-error-handling' into 'develop'
ReceiverWorker: Make sure non-{:ok, _} is returned as {:error, …}
See merge request pleroma/pleroma!4100
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/workers/receiver_worker.ex | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/pleroma/workers/receiver_worker.ex b/lib/pleroma/workers/receiver_worker.ex index 1dddd8d2e..8b2052c23 100644 --- a/lib/pleroma/workers/receiver_worker.ex +++ b/lib/pleroma/workers/receiver_worker.ex @@ -52,7 +52,8 @@ defmodule Pleroma.Workers.ReceiverWorker do {:error, {:reject, reason}} -> {:cancel, reason} {:signature, false} -> {:cancel, :invalid_signature} {:error, {:error, reason = "Object has been deleted"}} -> {:cancel, reason} - e -> e + {:error, _} = e -> e + e -> {:error, e} end end end |