nikdoof/test-auth
1
0
Fork 0
mirror of https://github.com/nikdoof/test-auth.git synced 2025-12-17 11:49:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't define SentryHandler per task, we should be doing this on the global scope

Browse Source
This commit is contained in:
Andrew Williams
2011-06-16 12:08:00 +01:00
parent 42299e2c09
commit f361189290
1 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/eve_api/tasks/corporation.py
View File

@@ -4,7 +4,6 @@ from datetime import datetime, timedelta
from xml.dom import minidom from xml.dom import minidom
from celery.decorators import task from celery.decorators import task
from sentry.client.handlers import SentryHandler
from eve_proxy.models import CachedDocument from eve_proxy.models import CachedDocument
from eve_proxy.exceptions import DocumentRetrievalError from eve_proxy.exceptions import DocumentRetrievalError
@@ -17,8 +16,6 @@ from eve_api.api_exceptions import APIAccessException
def import_corp_details(corp_id, callback=None): def import_corp_details(corp_id, callback=None):
log = import_corp_details.get_logger() log = import_corp_details.get_logger()
if SentryHandler not in map(lambda x: x.__class__, log.handlers):
logger.addHandler(SentryHandler())
try: try:
corp = import_corp_details_func(corp_id, log) corp = import_corp_details_func(corp_id, log)
@@ -37,8 +34,6 @@ def import_corp_details(corp_id, callback=None):
def import_corp_details_result(corp_id, callback=None): def import_corp_details_result(corp_id, callback=None):
log = import_corp_details_result.get_logger() log = import_corp_details_result.get_logger()
if SentryHandler not in map(lambda x: x.__class__, log.handlers):
logger.addHandler(SentryHandler())
try: try:
corp = import_corp_details_func(corp_id, log) corp = import_corp_details_func(corp_id, log)
@@ -122,8 +117,6 @@ def import_corp_members(api_userid, api_key, character_id):
""" """
log = import_corp_members.get_logger() log = import_corp_members.get_logger()
if SentryHandler not in map(lambda x: x.__class__, log.handlers):
logger.addHandler(SentryHandler())
# grab and decode /corp/MemberTracking.xml.aspx # grab and decode /corp/MemberTracking.xml.aspx
auth_params = {'userID': api_userid, 'apiKey': api_key, 'characterID': character_id } auth_params = {'userID': api_userid, 'apiKey': api_key, 'characterID': character_id }
@@ -132,14 +125,14 @@ def import_corp_members(api_userid, api_key, character_id):
no_cache=False) no_cache=False)
set = basic_xml_parse_doc(char_doc) set = basic_xml_parse_doc(char_doc)
if not 'eveapi' in set or not 'result' in ['eveapi']['result']: if not 'eveapi' in set or not 'result' in set['eveapi']:
log.error('Invalid XML document / API Error recceived', extra={'data': {'xml': char_doc.body, 'api_userid': api_userid, 'api_key': api_key, 'character_id': character_id}}) log.error('Invalid XML document / API Error recceived', extra={'data': {'xml': char_doc.body, 'api_userid': api_userid, 'api_key': api_key, 'character_id': character_id}})
return return
corp = EVEPlayerCharacter.objects.get(id=character_id).corporation corp = EVEPlayerCharacter.objects.get(id=character_id).corporation
charlist = [] charlist = []
for character in set['eveapi']['result']: for character in set['eveapi']['result']['members']:
charlist.append(int(character['characterID'])) charlist.append(int(character['characterID']))
charobj, created = EVEPlayerCharacter.objects.get_or_create(id=character['characterID']) charobj, created = EVEPlayerCharacter.objects.get_or_create(id=character['characterID'])
if created: if created: