projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
[akkoma]
/
lib
/
pleroma
/
workers
/
activity_expiration_worker.ex
diff --git
a/lib/pleroma/workers/activity_expiration_worker.ex
b/lib/pleroma/workers/activity_expiration_worker.ex
index 0b491eabbd629db1d67c09bee05a31b6de401a01..4e3e4195f7201472d15e963a770b0e6b5d141f2b 100644
(file)
--- a/
lib/pleroma/workers/activity_expiration_worker.ex
+++ b/
lib/pleroma/workers/activity_expiration_worker.ex
@@
-3,10
+3,7
@@
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Workers.ActivityExpirationWorker do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Workers.ActivityExpirationWorker do
- # Note: `max_attempts` is intended to be overridden in `new/2` call
- use Oban.Worker,
- queue: "activity_expiration",
- max_attempts: 1
+ use Pleroma.Workers.WorkerHelper, queue: "activity_expiration"
@impl Oban.Worker
def perform(
@impl Oban.Worker
def perform(
@@
-16,6
+13,6
@@
defmodule Pleroma.Workers.ActivityExpirationWorker do
},
_job
) do
},
_job
) do
- Pleroma.
ActivityExpirationWorker
.perform(:execute, activity_expiration_id)
+ Pleroma.
Daemons.ActivityExpirationDaemon
.perform(:execute, activity_expiration_id)
end
end
end
end