Fix some debug prints + HttpResponse for Gravatar

This commit is contained in:
Oliver Falk
2020-03-04 15:11:05 +01:00
parent b463f9f95a
commit 6bc0390b48
2 changed files with 7 additions and 6 deletions

View File

@@ -143,9 +143,6 @@ if 'POSTGRESQL_DATABASE' in os.environ:
'HOST': 'postgresql', 'HOST': 'postgresql',
} }
if os.path.isfile(os.path.join(BASE_DIR, 'config_local.py')):
from config_local import * # noqa # flake8: noqa # NOQA # pragma: no cover
SESSION_SERIALIZER = 'django.contrib.sessions.serializers.PickleSerializer' SESSION_SERIALIZER = 'django.contrib.sessions.serializers.PickleSerializer'
USE_X_FORWARDED_HOST = True USE_X_FORWARDED_HOST = True
@@ -198,3 +195,7 @@ CACHES = {
CACHE_IMAGES_MAX_AGE = 5 * 60 CACHE_IMAGES_MAX_AGE = 5 * 60
CACHE_RESPONSE = False CACHE_RESPONSE = False
# This MUST BE THE LAST!
if os.path.isfile(os.path.join(BASE_DIR, 'config_local.py')):
from config_local import * # noqa # flake8: noqa # NOQA # pragma: no cover

View File

@@ -322,7 +322,8 @@ class GravatarProxyView(View):
gravatar_test_url = 'https://secure.gravatar.com/avatar/' + kwargs['digest'] \ gravatar_test_url = 'https://secure.gravatar.com/avatar/' + kwargs['digest'] \
+ '?s=%i' % 50 + '?s=%i' % 50
if cache.get(gravatar_test_url) == 'default': if cache.get(gravatar_test_url) == 'default':
print("Cached Gravatar response: Default.") # DEBUG only
# print("Cached Gravatar response: Default.")
return redir_default(default) return redir_default(default)
try: try:
testdata = urlopen(gravatar_test_url, timeout=URL_TIMEOUT) testdata = urlopen(gravatar_test_url, timeout=URL_TIMEOUT)
@@ -365,8 +366,7 @@ class GravatarProxyView(View):
data = BytesIO(gravatarimagedata.read()) data = BytesIO(gravatarimagedata.read())
img = Image.open(data) img = Image.open(data)
data.seek(0) data.seek(0)
response = CachingHttpResponse( response = HttpResponse(
uri,
data.read(), data.read(),
content_type='image/%s' % file_format(img.format)) content_type='image/%s' % file_format(img.format))
response['Cache-Control'] = 'max-age=%i' % CACHE_IMAGES_MAX_AGE response['Cache-Control'] = 'max-age=%i' % CACHE_IMAGES_MAX_AGE