projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into issue/733
[akkoma]
/
lib
/
pleroma
/
web
/
oauth
/
token
/
clean_worker.ex
diff --git
a/lib/pleroma/web/oauth/token/clean_worker.ex
b/lib/pleroma/web/oauth/token/clean_worker.ex
index e39a4986a5fc16311280155d5ebc1abeb46ba3d8..eb94bf86f6a47a6458666852bd61969ad5a17be5 100644
(file)
--- a/
lib/pleroma/web/oauth/token/clean_worker.ex
+++ b/
lib/pleroma/web/oauth/token/clean_worker.ex
@@
-8,35
+8,31
@@
defmodule Pleroma.Web.OAuth.Token.CleanWorker do
"""
use GenServer
"""
use GenServer
- # 10 seconds
- @start_interval 10_000
+ @ten_seconds 10_000
+ @one_day 86_400_000
+
@interval Pleroma.Config.get(
@interval Pleroma.Config.get(
- # 24 hours
[:oauth2, :clean_expired_tokens_interval],
[:oauth2, :clean_expired_tokens_interval],
- 86_400_000
+ @one_day
)
)
- @queue :background
alias Pleroma.Web.OAuth.Token
alias Pleroma.Web.OAuth.Token
+ alias Pleroma.Workers.BackgroundWorker
- def start_link(_), do: GenServer.start_link(__MODULE__,
nil
)
+ def start_link(_), do: GenServer.start_link(__MODULE__,
%{}
)
def init(_) do
def init(_) do
- if Pleroma.Config.get([:oauth2, :clean_expired_tokens], false) do
- Process.send_after(self(), :perform, @start_interval)
- {:ok, nil}
- else
- :ignore
- end
+ Process.send_after(self(), :perform, @ten_seconds)
+ {:ok, nil}
end
@doc false
def handle_info(:perform, state) do
end
@doc false
def handle_info(:perform, state) do
+ BackgroundWorker.enqueue("clean_expired_tokens", %{})
+
Process.send_after(self(), :perform, @interval)
Process.send_after(self(), :perform, @interval)
- PleromaJobQueue.enqueue(@queue, __MODULE__, [:clean])
{:noreply, state}
end
{:noreply, state}
end
- # Job Worker Callbacks
def perform(:clean), do: Token.delete_expired_tokens()
end
def perform(:clean), do: Token.delete_expired_tokens()
end