mirror/netbox-community-netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00
Code Activity

Merge branch '1814-Ability_to_use_object_store_for_images' of github.com:steffann/netbox into 1814-Ability_to_use_object_store_for_images

Browse Source
This commit is contained in:
Sander Steffann
2019-12-11 15:23:47 +01:00
parent 378883df2b 02a009b7a7
commit f7a1595ce5
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
netbox/extras/models.py
View File

@ -616,13 +616,16 @@ class ImageAttachment(models.Model):
""" """
from django.conf import settings from django.conf import settings
if settings.MEDIA_STORAGE and settings.MEDIA_STORAGE['BACKEND'] == 'S3': if settings.MEDIA_STORAGE and settings.MEDIA_STORAGE['BACKEND'] == 'S3':
from botocore.exceptions import ClientError as AccessError # For S3 we need to handle a different exception
else: from botocore.exceptions import ClientError
AccessError = OSError try:
return self.image.size
except ClientError:
return None
try: try:
return self.image.size return self.image.size
except AccessError: except OSError:
return None return None