Use celery_once to prevent repeat task queueing.

Prevent group updates from being queued multiple times per user.

Default graceful to prevent raising exceptions.
This commit is contained in:
Adarnof
2018-03-19 20:39:27 -04:00
parent 20236cab8a
commit 73e6f576f4
12 changed files with 38 additions and 15 deletions

View File

@@ -9,6 +9,7 @@ from requests.exceptions import HTTPError
from allianceauth.services.hooks import NameFormatter
from .manager import DiscordOAuthManager, DiscordApiBackoff
from .models import DiscordUser
from allianceauth.services.tasks import QueueOnce
logger = logging.getLogger(__name__)
@@ -58,7 +59,7 @@ class DiscordTasks:
return True
@staticmethod
@shared_task(bind=True, name='discord.update_groups')
@shared_task(bind=True, name='discord.update_groups', base=QueueOnce)
def update_groups(task_self, pk):
user = User.objects.get(pk=pk)
logger.debug("Updating discord groups for user %s" % user)
@@ -99,7 +100,7 @@ class DiscordTasks:
DiscordTasks.update_groups.delay(discord_user.user.pk)
@staticmethod
@shared_task(bind=True, name='discord.update_nickname')
@shared_task(bind=True, name='discord.update_nickname', base=QueueOnce)
def update_nickname(task_self, pk):
user = User.objects.get(pk=pk)
logger.debug("Updating discord nickname for user %s" % user)

View File

@@ -6,6 +6,7 @@ from celery import shared_task
from allianceauth.notifications import notify
from allianceauth.services.hooks import NameFormatter
from allianceauth.services.tasks import QueueOnce
from .manager import DiscourseManager
from .models import DiscourseUser
@@ -40,7 +41,7 @@ class DiscourseTasks:
return False
@staticmethod
@shared_task(bind=True, name='discourse.update_groups')
@shared_task(bind=True, name='discourse.update_groups', base=QueueOnce)
def update_groups(self, pk):
user = User.objects.get(pk=pk)
logger.debug("Updating discourse groups for user %s" % user)

View File

@@ -3,7 +3,7 @@ import logging
from django.contrib.auth.models import User
from django.core.exceptions import ObjectDoesNotExist
from celery import shared_task
from allianceauth.services.tasks import QueueOnce
from .models import MumbleUser
logger = logging.getLogger(__name__)
@@ -26,7 +26,7 @@ class MumbleTasks:
MumbleUser.objects.all().delete()
@staticmethod
@shared_task(bind=True, name="mumble.update_groups")
@shared_task(bind=True, name="mumble.update_groups", base=QueueOnce)
def update_groups(self, pk):
user = User.objects.get(pk=pk)
logger.debug("Updating mumble groups for user %s" % user)

View File

@@ -4,7 +4,7 @@ from django.contrib.auth.models import User
from django.core.exceptions import ObjectDoesNotExist
from allianceauth.notifications import notify
from celery import shared_task
from allianceauth.services.tasks import QueueOnce
from allianceauth.services.modules.openfire.manager import OpenfireManager
from allianceauth.services.hooks import NameFormatter
from .models import OpenfireUser
@@ -40,7 +40,7 @@ class OpenfireTasks:
OpenfireUser.objects.all().delete()
@staticmethod
@shared_task(bind=True, name="openfire.update_groups")
@shared_task(bind=True, name="openfire.update_groups", base=QueueOnce)
def update_groups(self, pk):
user = User.objects.get(pk=pk)
logger.debug("Updating jabber groups for user %s" % user)

View File

@@ -3,7 +3,7 @@ import logging
from django.contrib.auth.models import User
from django.core.exceptions import ObjectDoesNotExist
from celery import shared_task
from allianceauth.services.tasks import QueueOnce
from allianceauth.notifications import notify
from allianceauth.services.hooks import NameFormatter
from .manager import Phpbb3Manager
@@ -35,7 +35,7 @@ class Phpbb3Tasks:
return False
@staticmethod
@shared_task(bind=True, name="phpbb3.update_groups")
@shared_task(bind=True, name="phpbb3.update_groups", base=QueueOnce)
def update_groups(self, pk):
user = User.objects.get(pk=pk)
logger.debug("Updating phpbb3 groups for user %s" % user)

View File

@@ -3,7 +3,7 @@ import logging
from django.contrib.auth.models import User
from django.core.exceptions import ObjectDoesNotExist
from celery import shared_task
from allianceauth.services.tasks import QueueOnce
from allianceauth.notifications import notify
from allianceauth.services.hooks import NameFormatter
from .manager import SeatManager
@@ -34,7 +34,7 @@ class SeatTasks:
return False
@staticmethod
@shared_task(bind=True)
@shared_task(bind=True, name='seat.update_roles', base=QueueOnce)
def update_roles(self, pk):
user = User.objects.get(pk=pk)
logger.debug("Updating SeAT roles for user %s" % user)

View File

@@ -3,7 +3,7 @@ import logging
from django.contrib.auth.models import User
from django.core.exceptions import ObjectDoesNotExist
from celery import shared_task
from allianceauth.services.tasks import QueueOnce
from allianceauth.notifications import notify
from allianceauth.services.hooks import NameFormatter
from .manager import SmfManager
@@ -39,7 +39,7 @@ class SmfTasks:
SmfUser.objects.all().delete()
@staticmethod
@shared_task(bind=True, name="smf.update_groups")
@shared_task(bind=True, name="smf.update_groups", base=QueueOnce)
def update_groups(self, pk):
user = User.objects.get(pk=pk)
logger.debug("Updating smf groups for user %s" % user)

View File

@@ -3,7 +3,7 @@ import logging
from django.contrib.auth.models import User
from django.core.exceptions import ObjectDoesNotExist
from celery import shared_task
from allianceauth.services.tasks import QueueOnce
from allianceauth.notifications import notify
from allianceauth.services.hooks import NameFormatter
from .manager import Teamspeak3Manager
@@ -56,7 +56,7 @@ class Teamspeak3Tasks:
logger.info("Teamspeak3 disabled")
@staticmethod
@shared_task(bind=True, name="teamspeak3.update_groups")
@shared_task(bind=True, name="teamspeak3.update_groups", base=QueueOnce)
def update_groups(self, pk):
user = User.objects.get(pk=pk)
logger.debug("Updating user %s teamspeak3 groups" % user)