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

Merge branch 'master' of https://github.com/R4stl1n/allianceauth into newcelery

Browse Source
This commit is contained in:
Adarnof 2015-12-11 12:51:21 +00:00
commit 8978d8322e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
celerytask/tasks.py
View File

@ -411,6 +411,7 @@ def run_api_refresh():
oldcorp_id = 0 oldcorp_id = 0
if EveManager.get_character_by_id(authserviceinfo.main_char_id): if EveManager.get_character_by_id(authserviceinfo.main_char_id):
oldcorp_id = EveCharacter.objects.get(character_id=authserviceinfo.main_char_id).corporation_id oldcorp_id = EveCharacter.objects.get(character_id=authserviceinfo.main_char_id).corporation_id
oldcorp_name = EveCharacter.objects.get(character_id=authserviceinfo.main_char_id).corporation_name
logger.debug("Determined user %s current main corp id %s" % (user, oldcorp_id)) logger.debug("Determined user %s current main corp id %s" % (user, oldcorp_id))
for api_key_pair in api_key_pairs: for api_key_pair in api_key_pairs:
logger.debug("Running update on api key %s" % api_key_pair.api_id) logger.debug("Running update on api key %s" % api_key_pair.api_id)
@ -466,7 +467,7 @@ def run_api_refresh():
logger.debug("API key %s has failed validation; it and its characters will be deleted." % api_key_pair.api_id) logger.debug("API key %s has failed validation; it and its characters will be deleted." % api_key_pair.api_id)
EveManager.delete_characters_by_api_id(api_key_pair.api_id, user.id) EveManager.delete_characters_by_api_id(api_key_pair.api_id, user.id)
EveManager.delete_api_key_pair(api_key_pair.api_id, user.id) EveManager.delete_api_key_pair(api_key_pair.api_id, user.id)
else: elif still_valid == True:
if api_key_pair.error_count != 0: if api_key_pair.error_count != 0:
logger.info("Clearing error count for api %s as it passed validation" % api_key_pair.api_id) logger.info("Clearing error count for api %s as it passed validation" % api_key_pair.api_id)
api_key_pair.error_count = 0 api_key_pair.error_count = 0
@ -519,8 +520,7 @@ def run_api_refresh():
elif corp.corporation_id != oldcorp_id: elif corp.corporation_id != oldcorp_id:
#changed corps, both corps auth'd, need to change group assignment #changed corps, both corps auth'd, need to change group assignment
logger.debug("User %s main character changed corp from id %s to %s, both meet membership requirements. Updating corp group." % (user, oldcorp_id, corp.corporation_id)) logger.debug("User %s main character changed corp from id %s to %s, both meet membership requirements. Updating corp group." % (user, oldcorp_id, corp.corporation_id))
oldcorp = EveCorporationInfo.objects.get(corporation_id=oldcorp_id) remove_user_from_group(user, generate_corp_group_name(oldcorp_name))
remove_user_from_group(user, generate_corp_group_name(oldcorp.corporation_name))
add_user_to_group(user, generate_corp_group_name(character.corporation_name)) add_user_to_group(user, generate_corp_group_name(character.corporation_name))
#reset services to force new mumble names and group assignments #reset services to force new mumble names and group assignments
deactivate_services(user) deactivate_services(user)