Browse Source

fix cron wroker

merge-requests/2900/head
Maksim Pechnikov 3 years ago
parent
commit
9b055f7211
5 changed files with 10 additions and 12 deletions
  1. +2
    -2
      lib/pleroma/workers/cron/clear_oauth_token_worker.ex
  2. +2
    -2
      lib/pleroma/workers/cron/digest_emails_worker.ex
  3. +2
    -4
      lib/pleroma/workers/cron/new_users_digest_worker.ex
  4. +3
    -4
      lib/pleroma/workers/cron/purge_expired_activities_worker.ex
  5. +1
    -0
      lib/pleroma/workers/cron/stats_worker.ex

+ 2
- 2
lib/pleroma/workers/cron/clear_oauth_token_worker.ex View File

@@ -16,8 +16,8 @@ defmodule Pleroma.Workers.Cron.ClearOauthTokenWorker do
def perform(_job) do
if Config.get([:oauth2, :clean_expired_tokens], false) do
Token.delete_expired_tokens()
else
:ok
end

:ok
end
end

+ 2
- 2
lib/pleroma/workers/cron/digest_emails_worker.ex View File

@@ -37,9 +37,9 @@ defmodule Pleroma.Workers.Cron.DigestEmailsWorker do
)
|> Repo.all()
|> send_emails
else
:ok
end

:ok
end

def send_emails(users) do


+ 2
- 4
lib/pleroma/workers/cron/new_users_digest_worker.ex View File

@@ -55,11 +55,9 @@ defmodule Pleroma.Workers.Cron.NewUsersDigestWorker do
|> Repo.all()
|> Enum.map(&Pleroma.Emails.NewUsersDigestEmail.new_users(&1, users_and_statuses))
|> Enum.each(&Pleroma.Emails.Mailer.deliver/1)
else
:ok
end
else
:ok
end

:ok
end
end

+ 3
- 4
lib/pleroma/workers/cron/purge_expired_activities_worker.ex View File

@@ -21,10 +21,9 @@ defmodule Pleroma.Workers.Cron.PurgeExpiredActivitiesWorker do

@impl Oban.Worker
def perform(_job) do
if Config.get([ActivityExpiration, :enabled]) do
Enum.each(ActivityExpiration.due_expirations(@interval), &delete_activity/1)
end

if Config.get([ActivityExpiration, :enabled]) do
Enum.each(ActivityExpiration.due_expirations(@interval), &delete_activity/1)
end
after
:ok
end


+ 1
- 0
lib/pleroma/workers/cron/stats_worker.ex View File

@@ -12,5 +12,6 @@ defmodule Pleroma.Workers.Cron.StatsWorker do
@impl Oban.Worker
def perform(_job) do
Pleroma.Stats.do_collect()
:ok
end
end

Loading…
Cancel
Save