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

Fix some minor issues in eve_proxy stopping API proxy from working correctly

Browse Source
This commit is contained in:
Andrew Williams
2012-05-20 11:39:57 +01:00
parent e1dc20ff2e
commit 4a7cde9176
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/eve_proxy/models.py
View File

@@ -119,7 +119,7 @@ class CachedDocumentManager(models.Manager):
# This allows for clock skew not to fuck with the timers. # This allows for clock skew not to fuck with the timers.
currenttime = datetime.strptime(dom.getElementsByTagName('currentTime')[0].childNodes[0].nodeValue, '%Y-%m-%d %H:%M:%S') currenttime = datetime.strptime(dom.getElementsByTagName('currentTime')[0].childNodes[0].nodeValue, '%Y-%m-%d %H:%M:%S')
cacheuntil = datetime.strptime(dom.getElementsByTagName('cachedUntil')[0].childNodes[0].nodeValue, '%Y-%m-%d %H:%M:%S') cacheuntil = datetime.strptime(dom.getElementsByTagName('cachedUntil')[0].childNodes[0].nodeValue, '%Y-%m-%d %H:%M:%S')
date = now() + (cacheuntil - currenttime) doc.cached_until = now() + (cacheuntil - currenttime)
# Add the global adjustment, to avoid CCP's hardline cache timers # Add the global adjustment, to avoid CCP's hardline cache timers
doc.cached_until += timedelta(seconds=getattr(settings, 'EVE_PROXY_GLOBAL_CACHE_ADJUSTMENT', 30)) doc.cached_until += timedelta(seconds=getattr(settings, 'EVE_PROXY_GLOBAL_CACHE_ADJUSTMENT', 30))

10
app/eve_proxy/views.py
View File

@@ -1,5 +1,7 @@
from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse
from django.http import HttpResponse, HttpResponseNotFound, HttpResponseServerError from django.http import HttpResponse, HttpResponseNotFound, HttpResponseServerError
from django.views.generic import View
from eve_proxy.models import CachedDocument from eve_proxy.models import CachedDocument
@@ -22,10 +24,10 @@ class EVEAPIProxyView(View):
if 'userID' in params and not 'service' in params: if 'userID' in params and not 'service' in params:
return HttpResponse('No Service ID provided.') return HttpResponse('No Service ID provided.')
try: #try:
cached_doc = CachedDocument.objects.api_query(url_path, params, exceptions=False) cached_doc = CachedDocument.objects.api_query(url_path, params, exceptions=False)
except: #except:
return HttpResponseServerError('Error occured') # return HttpResponseServerError('Error occured')
if cached_doc: if cached_doc:
return HttpResponse(cached_doc.body, mimetype='text/xml') return HttpResponse(cached_doc.body, mimetype='text/xml')