From b6ffde75ef298e60b8c4696b25c49cc08d030aab Mon Sep 17 00:00:00 2001 From: Seth Foster Date: Fri, 27 Sep 2019 12:31:10 -0400 Subject: [PATCH] check expired sessions only if User exists - Indent rest of code into the conditional that checks for expired sessions of that User - If user doesn't exist, no need to check --- awx/main/signals.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/awx/main/signals.py b/awx/main/signals.py index bbe75281d4..accd00e367 100644 --- a/awx/main/signals.py +++ b/awx/main/signals.py @@ -687,15 +687,15 @@ def save_user_session_membership(sender, **kwargs): # check if user_id from session has an id match in User before saving if User.objects.filter(id=int(user_id)).exists(): UserSessionMembership(user_id=user_id, session=session, created=timezone.now()).save() - expired = UserSessionMembership.get_memberships_over_limit(user_id) - for membership in expired: - Session.objects.filter(session_key__in=[membership.session_id]).delete() - membership.delete() - if len(expired): - consumers.emit_channel_notification( - 'control-limit_reached_{}'.format(user_id), - dict(group_name='control', reason='limit_reached') - ) + expired = UserSessionMembership.get_memberships_over_limit(user_id) + for membership in expired: + Session.objects.filter(session_key__in=[membership.session_id]).delete() + membership.delete() + if len(expired): + consumers.emit_channel_notification( + 'control-limit_reached_{}'.format(user_id), + dict(group_name='control', reason='limit_reached') + ) @receiver(post_save, sender=OAuth2AccessToken)