MirrorMirror
/
funkwhale
mirror of https://dev.funkwhale.audio/funkwhale/funkwhale.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix #1077: improved performance and error handling in fetch_attachment

This commit is contained in:
Agate 2020-04-21 14:47:16 +02:00
parent 08ffc7adc5
commit c529d4d260
No known key found for this signature in database
GPG Key ID: 6B501DFD73514E14
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/funkwhale_api/common/tasks.py
View File

@ -77,7 +77,7 @@ def fetch_remote_attachment(attachment, filename=None, save=True):
attachment.last_fetch_date = timezone.now() attachment.last_fetch_date = timezone.now()
with tempfile.TemporaryFile() as tf: with tempfile.TemporaryFile() as tf:
with s.get(attachment.url, timeout=5, stream=True) as r: with s.get(attachment.url, timeout=5, stream=True) as r:
for chunk in r.iter_content(): for chunk in r.iter_content(chunk_size=1024 * 100):
tf.write(chunk) tf.write(chunk)
tf.seek(0) tf.seek(0)
if not filename: if not filename:

10
api/funkwhale_api/common/views.py
View File

@ -1,3 +1,4 @@
import logging
import time import time
from django.conf import settings from django.conf import settings
@ -23,6 +24,9 @@ from . import throttling
from . import utils from . import utils
logger = logging.getLogger(__name__)
class SkipFilterForGetObject: class SkipFilterForGetObject:
def get_object(self, *args, **kwargs): def get_object(self, *args, **kwargs):
setattr(self.request, "_skip_filters", True) setattr(self.request, "_skip_filters", True)
@ -172,7 +176,11 @@ class AttachmentViewSet(
if size not in ["original", "medium_square_crop"]: if size not in ["original", "medium_square_crop"]:
size = "original" size = "original"
tasks.fetch_remote_attachment(instance) try:
tasks.fetch_remote_attachment(instance)
except Exception:
logger.exception("Error while fetching attachment %s", instance.url)
return response.Response(status=500)
data = self.serializer_class(instance).data data = self.serializer_class(instance).data
redirect = response.Response(status=302) redirect = response.Response(status=302)
redirect["Location"] = data["urls"][size] redirect["Location"] = data["urls"][size]