Mathis/allianceauth
1
0
Fork 0
mirror of https://gitlab.com/allianceauth/allianceauth.git synced 2025-07-13 22:40:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Wait until transaction completes to call group syncs (#571)

Browse Source 
Prevents syncing of old groups when celery workers execute faster than db transactions can be completed.
This commit is contained in:
Basraah 2016-11-03 10:28:20 +10:00 committed by Adarnof
parent 2d3055480c
commit dc4b4bbdf5
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
services/signals.py
View File

@ -1,4 +1,5 @@
from __future__ import unicode_literals from __future__ import unicode_literals
from django.db import transaction
from django.db.models.signals import m2m_changed from django.db.models.signals import m2m_changed
from django.db.models.signals import post_save from django.db.models.signals import post_save
from django.db.models.signals import pre_save from django.db.models.signals import pre_save
@ -26,7 +27,8 @@ logger = logging.getLogger(__name__)
@receiver(m2m_changed, sender=User.groups.through) @receiver(m2m_changed, sender=User.groups.through)
def m2m_changed_user_groups(sender, instance, action, *args, **kwargs): def m2m_changed_user_groups(sender, instance, action, *args, **kwargs):
logger.debug("Received m2m_changed from %s groups with action %s" % (instance, action)) logger.debug("Received m2m_changed from %s groups with action %s" % (instance, action))
if action == "post_add" or action == "post_remove" or action == "post_clear":
def trigger_service_group_update():
logger.debug("Triggering service group update for %s" % instance) logger.debug("Triggering service group update for %s" % instance)
auth, c = AuthServicesInfo.objects.get_or_create(user=instance) auth, c = AuthServicesInfo.objects.get_or_create(user=instance)
if auth.jabber_username: if auth.jabber_username:
@ -48,6 +50,10 @@ def m2m_changed_user_groups(sender, instance, action, *args, **kwargs):
if auth.smf_username: if auth.smf_username:
update_smf_groups.delay(instance.pk) update_smf_groups.delay(instance.pk)
if action == "post_add" or action == "post_remove" or action == "post_clear":
logger.debug("Waiting for commit to trigger service group update for %s" % instance)
transaction.on_commit(trigger_service_group_update)
def trigger_all_ts_update(): def trigger_all_ts_update():
for auth in AuthServicesInfo.objects.filter(teamspeak3_uid__isnull=False): for auth in AuthServicesInfo.objects.filter(teamspeak3_uid__isnull=False):