nikdoof/test-auth
1
0
Fork 0
mirror of https://github.com/nikdoof/test-auth.git synced 2025-12-14 23:02:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add some better error checking and retrying around Corporation detail import

Browse Source
This commit is contained in:
Dreddit Web User
2011-02-09 12:43:19 +00:00
parent c3f5b9b0bd
commit 6acaf5c0f1
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
eve_api/tasks/alliance.py
View File

@@ -36,7 +36,6 @@ def import_alliance_details():
for corp in alliance['memberCorporations']: for corp in alliance['memberCorporations']:
if int(corp['corporationID']) not in corplist: if int(corp['corporationID']) not in corplist:
import_corp_details.delay(corp['corporationID']) import_corp_details.delay(corp['corporationID'])
pass
validcorps.append(int(corp['corporationID'])) validcorps.append(int(corp['corporationID']))
delcorps = set(corplist) - set(validcorps) delcorps = set(corplist) - set(validcorps)

6
eve_api/tasks/corporation.py
View File

@@ -4,6 +4,7 @@ from xml.dom import minidom
from celery.decorators import task from celery.decorators import task
from eve_proxy.models import CachedDocument from eve_proxy.models import CachedDocument
from eve_proxy.exceptions imort DocumentRetrievalError
from eve_api.models import EVEPlayerCorporation, EVEPlayerCharacter, EVEPlayerAlliance from eve_api.models import EVEPlayerCorporation, EVEPlayerCharacter, EVEPlayerAlliance
from eve_api.utils import basic_xml_parse_doc from eve_api.utils import basic_xml_parse_doc
from eve_api.tasks.character import import_eve_character from eve_api.tasks.character import import_eve_character
@@ -43,7 +44,12 @@ def import_corp_details_func(corp_id, log=logging.getLogger(__name__)):
corpobj, created = EVEPlayerCorporation.objects.get_or_create(id=corp_id) corpobj, created = EVEPlayerCorporation.objects.get_or_create(id=corp_id)
if created or not corpobj.api_last_updated or corpobj.api_last_updated < (datetime.utcnow() - timedelta(hours=12)): if created or not corpobj.api_last_updated or corpobj.api_last_updated < (datetime.utcnow() - timedelta(hours=12)):
try:
doc = CachedDocument.objects.api_query('/corp/CorporationSheet.xml.aspx', {'corporationID': corp_id}) doc = CachedDocument.objects.api_query('/corp/CorporationSheet.xml.aspx', {'corporationID': corp_id})
except DocumentRetrievalError, exc:
logger.error('Error retrieving CorporationSheet.xml.aspx for ID %s - %s' % (corp_id, exc))
raise APIAccessException
d = basic_xml_parse_doc(doc)['eveapi'] d = basic_xml_parse_doc(doc)['eveapi']
if 'error' in d: if 'error' in d: