diff options
| author | Mark Felder <feld@feld.me> | 2024-07-15 10:15:23 -0400 |
|---|---|---|
| committer | Mark Felder <feld@feld.me> | 2024-07-15 10:27:37 -0400 |
| commit | 1e8d1904e61c73f624bdce600fc243dff81e19fc (patch) | |
| tree | 0cd2834b68210c7ccd717961b41924a0d38835f2 | |
| parent | 0ea63d824e6381723ad99e544fd8b08ea9d721fd (diff) | |
| download | pleroma-1e8d1904e61c73f624bdce600fc243dff81e19fc.tar.gz pleroma-1e8d1904e61c73f624bdce600fc243dff81e19fc.zip | |
Define missing Oban timeouts
| -rw-r--r-- | changelog.d/oban-timeouts.change | 1 | ||||
| -rw-r--r-- | lib/pleroma/workers/cron/digest_emails_worker.ex | 3 | ||||
| -rw-r--r-- | lib/pleroma/workers/cron/new_users_digest_worker.ex | 3 | ||||
| -rw-r--r-- | lib/pleroma/workers/rich_media_worker.ex | 3 | ||||
| -rw-r--r-- | lib/pleroma/workers/search_indexing_worker.ex | 3 | ||||
| -rw-r--r-- | lib/pleroma/workers/user_refresh_worker.ex | 3 |
6 files changed, 16 insertions, 0 deletions
diff --git a/changelog.d/oban-timeouts.change b/changelog.d/oban-timeouts.change new file mode 100644 index 000000000..33d017c5c --- /dev/null +++ b/changelog.d/oban-timeouts.change @@ -0,0 +1 @@ +Ensure all Oban jobs have timeouts defined diff --git a/lib/pleroma/workers/cron/digest_emails_worker.ex b/lib/pleroma/workers/cron/digest_emails_worker.ex index 0292bbb3b..17e92d10b 100644 --- a/lib/pleroma/workers/cron/digest_emails_worker.ex +++ b/lib/pleroma/workers/cron/digest_emails_worker.ex @@ -58,4 +58,7 @@ defmodule Pleroma.Workers.Cron.DigestEmailsWorker do User.touch_last_digest_emailed_at(user) end + + @impl Oban.Worker + def timeout(_job), do: :timer.seconds(5) end diff --git a/lib/pleroma/workers/cron/new_users_digest_worker.ex b/lib/pleroma/workers/cron/new_users_digest_worker.ex index d2abb2d3b..1f57aad4a 100644 --- a/lib/pleroma/workers/cron/new_users_digest_worker.ex +++ b/lib/pleroma/workers/cron/new_users_digest_worker.ex @@ -60,4 +60,7 @@ defmodule Pleroma.Workers.Cron.NewUsersDigestWorker do :ok end + + @impl Oban.Worker + def timeout(_job), do: :timer.seconds(5) end diff --git a/lib/pleroma/workers/rich_media_worker.ex b/lib/pleroma/workers/rich_media_worker.ex index f18ac658a..ecc980a28 100644 --- a/lib/pleroma/workers/rich_media_worker.ex +++ b/lib/pleroma/workers/rich_media_worker.ex @@ -16,4 +16,7 @@ defmodule Pleroma.Workers.RichMediaWorker do def perform(%Job{args: %{"op" => "backfill", "url" => _url} = args}) do Backfill.run(args) end + + @impl Oban.Worker + def timeout(_job), do: :timer.seconds(5) end diff --git a/lib/pleroma/workers/search_indexing_worker.ex b/lib/pleroma/workers/search_indexing_worker.ex index 8476a2be5..8969ae378 100644 --- a/lib/pleroma/workers/search_indexing_worker.ex +++ b/lib/pleroma/workers/search_indexing_worker.ex @@ -20,4 +20,7 @@ defmodule Pleroma.Workers.SearchIndexingWorker do search_module.remove_from_index(object) end + + @impl Oban.Worker + def timeout(_job), do: :timer.seconds(5) end diff --git a/lib/pleroma/workers/user_refresh_worker.ex b/lib/pleroma/workers/user_refresh_worker.ex index f43170c8f..0c04fb237 100644 --- a/lib/pleroma/workers/user_refresh_worker.ex +++ b/lib/pleroma/workers/user_refresh_worker.ex @@ -11,4 +11,7 @@ defmodule Pleroma.Workers.UserRefreshWorker do def perform(%Job{args: %{"ap_id" => ap_id}}) do User.fetch_by_ap_id(ap_id) end + + @impl Oban.Worker + def timeout(_job), do: :timer.seconds(5) end |