External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-15 10:10:01 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3910 from AlanCoding/no_user_get

Browse Source 
Avoid unnecessary user get expiring session memberships

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
This commit is contained in:
softwarefactory-project-zuul[bot]
2019-05-20 17:20:36 +00:00
committed by GitHub
parent 9d4cfa7400 1223148116
commit dc1bf3ef07
2 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/main/models/organization.py
View File

@@ -177,14 +177,14 @@ class UserSessionMembership(BaseModel):
created = models.DateTimeField(default=None, editable=False) created = models.DateTimeField(default=None, editable=False)
@staticmethod @staticmethod
def get_memberships_over_limit(user, now=None): def get_memberships_over_limit(user_id, now=None):
if settings.SESSIONS_PER_USER == -1: if settings.SESSIONS_PER_USER == -1:
return [] return []
if now is None: if now is None:
now = tz_now() now = tz_now()
query_set = UserSessionMembership.objects\ query_set = UserSessionMembership.objects\
.select_related('session')\ .select_related('session')\
.filter(user=user)\ .filter(user_id=user_id)\
.order_by('-created') .order_by('-created')
non_expire_memberships = [x for x in query_set if x.session.expire_date > now] non_expire_memberships = [x for x in query_set if x.session.expire_date > now]
return non_expire_memberships[settings.SESSIONS_PER_USER:] return non_expire_memberships[settings.SESSIONS_PER_USER:]

13
awx/main/signals.py
View File

@@ -652,20 +652,19 @@ def save_user_session_membership(sender, **kwargs):
return return
if not session: if not session:
return return
user = session.get_decoded().get(SESSION_KEY, None) user_id = session.get_decoded().get(SESSION_KEY, None)
if not user: if not user_id:
return return
user = User.objects.get(pk=user) if UserSessionMembership.objects.filter(user=user_id, session=session).exists():
if UserSessionMembership.objects.filter(user=user, session=session).exists():
return return
UserSessionMembership(user=user, session=session, created=timezone.now()).save() UserSessionMembership(user_id=user_id, session=session, created=timezone.now()).save()
expired = UserSessionMembership.get_memberships_over_limit(user) expired = UserSessionMembership.get_memberships_over_limit(user_id)
for membership in expired: for membership in expired:
Session.objects.filter(session_key__in=[membership.session_id]).delete() Session.objects.filter(session_key__in=[membership.session_id]).delete()
membership.delete() membership.delete()
if len(expired): if len(expired):
consumers.emit_channel_notification( consumers.emit_channel_notification(
'control-limit_reached_{}'.format(user.pk), 'control-limit_reached_{}'.format(user_id),
dict(group_name='control', reason='limit_reached') dict(group_name='control', reason='limit_reached')
) )