diff options
| author | lain <lain@soykaf.club> | 2019-12-09 13:59:35 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2019-12-09 13:59:35 +0000 |
| commit | 8d2ca85cea7285330c724096b668b4b56b77caf8 (patch) | |
| tree | 09ff6654215ae81f9a50acc5d992ffd9680b10ca | |
| parent | 49110f049855be9e7ac79ca228201db7de225388 (diff) | |
| parent | a5e28bf2145f068a264ba1eafc3dd3067672547d (diff) | |
| download | pleroma-8d2ca85cea7285330c724096b668b4b56b77caf8.tar.gz | |
Merge branch 'fix/oauth-compile-time' into 'develop'
OAuth token cleanup: Get rid of compile-time configuration
See merge request pleroma/pleroma!2044
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | lib/pleroma/web/oauth/token/clean_worker.ex | 8 |
2 files changed, 3 insertions, 6 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 3d578caef..d52ab341b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -82,6 +82,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Report emails now include functional links to profiles of remote user accounts - Not being able to log in to some third-party apps when logged in to MastoFE - MRF: `Delete` activities being exempt from MRF policies +- OTP releases: Not being able to configure OAuth expired token cleanup interval - OTP releases: Not being able to configure HTML sanitization policy <details> <summary>API Changes</summary> diff --git a/lib/pleroma/web/oauth/token/clean_worker.ex b/lib/pleroma/web/oauth/token/clean_worker.ex index f639f9c6f..3c9c580d5 100644 --- a/lib/pleroma/web/oauth/token/clean_worker.ex +++ b/lib/pleroma/web/oauth/token/clean_worker.ex @@ -11,11 +11,6 @@ defmodule Pleroma.Web.OAuth.Token.CleanWorker do @ten_seconds 10_000 @one_day 86_400_000 - @interval Pleroma.Config.get( - [:oauth2, :clean_expired_tokens_interval], - @one_day - ) - alias Pleroma.Web.OAuth.Token alias Pleroma.Workers.BackgroundWorker @@ -29,8 +24,9 @@ defmodule Pleroma.Web.OAuth.Token.CleanWorker do @doc false def handle_info(:perform, state) do BackgroundWorker.enqueue("clean_expired_tokens", %{}) + interval = Pleroma.Config.get([:oauth2, :clean_expired_tokens_interval], @one_day) - Process.send_after(self(), :perform, @interval) + Process.send_after(self(), :perform, interval) {:noreply, state} end |