From 4a7cde91763aab4478b5292b6adb50836b70312e Mon Sep 17 00:00:00 2001 From: Andrew Williams Date: Sun, 20 May 2012 11:39:57 +0100 Subject: [PATCH] Fix some minor issues in eve_proxy stopping API proxy from working correctly --- app/eve_proxy/models.py | 2 +- app/eve_proxy/views.py | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/app/eve_proxy/models.py b/app/eve_proxy/models.py index f548a42..0709e0e 100644 --- a/app/eve_proxy/models.py +++ b/app/eve_proxy/models.py @@ -119,7 +119,7 @@ class CachedDocumentManager(models.Manager): # 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') 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 doc.cached_until += timedelta(seconds=getattr(settings, 'EVE_PROXY_GLOBAL_CACHE_ADJUSTMENT', 30)) diff --git a/app/eve_proxy/views.py b/app/eve_proxy/views.py index 3108cdc..8d52a08 100644 --- a/app/eve_proxy/views.py +++ b/app/eve_proxy/views.py @@ -1,5 +1,7 @@ from django.core.urlresolvers import reverse from django.http import HttpResponse, HttpResponseNotFound, HttpResponseServerError +from django.views.generic import View + from eve_proxy.models import CachedDocument @@ -22,10 +24,10 @@ class EVEAPIProxyView(View): if 'userID' in params and not 'service' in params: return HttpResponse('No Service ID provided.') - try: - cached_doc = CachedDocument.objects.api_query(url_path, params, exceptions=False) - except: - return HttpResponseServerError('Error occured') + #try: + cached_doc = CachedDocument.objects.api_query(url_path, params, exceptions=False) + #except: + # return HttpResponseServerError('Error occured') if cached_doc: return HttpResponse(cached_doc.body, mimetype='text/xml')