trustchain-oc1-orchestral/authentik
Archived
10
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

admin: improve check to remove version notifications

Browse source 
Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
This commit is contained in:
Jens Langhammer 2021-11-05 12:53:46 +01:00
parent 74fb0f9e2a
commit 6424bf98da
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
authentik/admin/tasks.py
View file

@ -27,6 +27,7 @@ VERSION_CACHE_TIMEOUT = 8 * 60 * 60 # 8 hours
# Chop of the first ^ because we want to search the entire string # Chop of the first ^ because we want to search the entire string
URL_FINDER = URLValidator.regex.pattern[1:] URL_FINDER = URLValidator.regex.pattern[1:]
PROM_INFO = Info("authentik_version", "Currently running authentik version") PROM_INFO = Info("authentik_version", "Currently running authentik version")
LOCAL_VERSION = parse(__version__)
def _set_prom_info(): def _set_prom_info():
@ -48,7 +49,7 @@ def clear_update_notifications():
if "new_version" not in notification.event.context: if "new_version" not in notification.event.context:
continue continue
notification_version = notification.event.context["new_version"] notification_version = notification.event.context["new_version"]
if notification_version == __version__: if LOCAL_VERSION >= parse(notification_version):
notification.delete() notification.delete()
@ -74,8 +75,7 @@ def update_latest_version(self: MonitoredTask):
_set_prom_info() _set_prom_info()
# Check if upstream version is newer than what we're running, # Check if upstream version is newer than what we're running,
# and if no event exists yet, create one. # and if no event exists yet, create one.
local_version = parse(__version__) if LOCAL_VERSION < parse(upstream_version):
if local_version < parse(upstream_version):
# Event has already been created, don't create duplicate # Event has already been created, don't create duplicate
if Event.objects.filter( if Event.objects.filter(
action=EventAction.UPDATE_AVAILABLE, action=EventAction.UPDATE_AVAILABLE,