add timeouts to screenshot server requests, show error message in django admin

Author: yvess

django/gsmap/admin.py

@@ -3,8 +3,10 @@
 from django.utils.translation import gettext as _
 from django_json_widget.widgets import JSONEditorWidget
 from django.utils.html import mark_safe
+from django.contrib import messages
 from sortedm2m_filter_horizontal_widget.forms import SortedFilteredSelectMultiple
 from gsmap.models import Municipality, Snapshot, Workspace
+import requests
 
 
 class MunicipalityAdmin(admin.OSMGeoAdmin):
@@ -70,6 +72,13 @@ def thumbnail_manual_image(self, obj):
         return self._image_display(obj.thumbnail_manual.url, width=200)
 
 
+    def save_model(self, request, obj, form, change):
+        try:
+            obj.save()
+        except (requests.exceptions.ReadTimeout, requests.exceptions.ConnectionError) as e:
+            messages.error(request, "Couldn't create the screenshots, screenshot server problem.")
+
+
 class WorkspaceAdmin(admin.OSMGeoAdmin):
     readonly_fields = ('id', 'created', 'modified', 'get_absolute_link')
     fieldsets = (

django/gsmap/models.py

@@ -160,7 +160,7 @@ def create_screenshot_file(self, is_thumbnail=False):
         if is_thumbnail:
             url += '&thumbnail'
             path = 'snapshot-thumbnails'
-        response = requests.get(url)
+        response = requests.get(url, timeout=(5, 30))
         date_suffix = timezone.now().strftime("%Y-%m-%d_%H-%M-%SZ")
         screenshot_file = SimpleUploadedFile(
             f'{path}/{self.pk}_{date_suffix}.png',