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

Fixed exception thrown in celery

Browse Source
This commit is contained in:
Raynaldo Rivera 2014-10-12 11:03:32 -07:00
parent 534eb460e1
commit 0256feeceb
2 changed files with 49 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
alliance_auth/settings.py
View File

@ -144,7 +144,7 @@ DEFAULT_ALLIANCE_GROUP = 'AllianceMember'
# ALLIANCE INFO
ALLIANCE_ID = '0'
ALLIANCE_NAME = 'Alliance Name'
ALLIANCE_NAME = 'SomeAllianceName'
# Jabber Prosody Info
JABBER_URL = "@someaddress.com"

82
celerytask/tasks.py
View File

@ -50,47 +50,61 @@ def update_forum_groups(user):
def add_to_databases(user, groups, syncgroups):
authserviceinfo = AuthServicesInfo.objects.get(user=user)
update = False
for group in groups:
syncgroup = syncgroups.filter(groupname=group.name)
if not syncgroup:
# gotta create group
# create syncgroup
# create service groups
synccache = SyncGroupCache()
synccache.groupname = group.name
synccache.user = user
synccache.save()
update = True
authserviceinfo = None
try:
authserviceinfo = AuthServicesInfo.objects.get(user=user)
except:
pass
if update:
if authserviceinfo.jabber_username != "":
update_jabber_groups(user)
if authserviceinfo.mumble_username != "":
update_mumble_groups(user)
if authserviceinfo.forum_username != "":
update_forum_groups(user)
if authserviceinfo:
authserviceinfo = AuthServicesInfo.objects.get(user=user)
update = False
for group in groups:
syncgroup = syncgroups.filter(groupname=group.name)
if not syncgroup:
# gotta create group
# create syncgroup
# create service groups
synccache = SyncGroupCache()
synccache.groupname = group.name
synccache.user = user
synccache.save()
update = True
if update:
if authserviceinfo.jabber_username != "":
update_jabber_groups(user)
if authserviceinfo.mumble_username != "":
update_mumble_groups(user)
if authserviceinfo.forum_username != "":
update_forum_groups(user)
def remove_from_databases(user, groups, syncgroups):
authserviceinfo = AuthServicesInfo.objects.get(user=user)
update = False
for syncgroup in syncgroups:
group = groups.filter(name=syncgroup.groupname)
authserviceinfo = None
try:
authserviceinfo = AuthServicesInfo.objects.get(user=user)
except:
pass
if not group:
syncgroup.delete()
update = True
if authserviceinfo:
update = False
for syncgroup in syncgroups:
group = groups.filter(name=syncgroup.groupname)
if update:
if authserviceinfo.jabber_username != "":
update_jabber_groups(user)
if authserviceinfo.mumble_username != "":
update_mumble_groups(user)
if authserviceinfo.forum_username != "":
update_forum_groups(user)
if not group:
syncgroup.delete()
update = True
if update:
if authserviceinfo.jabber_username != "":
update_jabber_groups(user)
if authserviceinfo.mumble_username != "":
update_mumble_groups(user)
if authserviceinfo.forum_username != "":
update_forum_groups(user)
@periodic_task(run_every=crontab(minute="*/1"))