Honour project_settings_read_timeout when resolving external layers

Author: manisandro

src/config_generator/external_layer_utils.py

@@ -42,7 +42,7 @@ def getWmsRequestUrl(WMS_Capabilities, reqType, urlObj):
     except:
         return urllib.parse.urlunparse(urlObj)
 
-def resolve_external_layer(resource, logger, crs=None):
+def resolve_external_layer(resource, logger, timeout, crs=None):
     cpos = resource.find(':')
     hpos = resource.rfind('#')
     if hpos == -1:
@@ -63,20 +63,20 @@ def resolve_external_layer(resource, logger, crs=None):
             urlobj = urlobj._replace(query=urllib.parse.urlencode(params))
             url = urllib.parse.urlunparse(urlobj)
 
-        return get_external_wms_layer(resource, url, layername, infoFormat, logger)
+        return get_external_wms_layer(resource, url, layername, infoFormat, logger, timeout)
     elif type == "wmts":
         if not crs:
             urlobj = urllib.parse.urlparse(url)
             params = dict(urllib.parse.parse_qsl(urlobj.query))
             crs = params.get('crs', 'EPSG:3857')
-        return get_external_wmts_layer(resource, url, layername, crs, logger)
+        return get_external_wmts_layer(resource, url, layername, crs, logger, timeout)
     elif type == "mvt":
         return get_extermal_mvt_layer(resource, url, layername)
     else:
         logger.warn("Unknown external layer: %s" % resource)
         return None
 
-def get_external_wms_layer(resource, url, layerName, infoFormat, logger):
+def get_external_wms_layer(resource, url, layerName, infoFormat, logger, timeout):
 
     global capabilites_cache
 
@@ -106,7 +106,7 @@ def get_external_wms_layer(resource, url, layerName, infoFormat, logger):
 
     if not capabilites_cache.lookup(capabilitiesUrl):
         try:
-            response = urllib.request.urlopen(capabilitiesUrl)
+            response = urllib.request.urlopen(capabilitiesUrl, timeout=timeout)
         except:
             logger.warn("Failed to download capabilities for external layer %s" % resource)
             return None
@@ -198,13 +198,13 @@ def get_external_wms_layer(resource, url, layerName, infoFormat, logger):
     }
 
 
-def get_external_wmts_layer(resource, capabilitiesUrl, layerName, crs, logger):
+def get_external_wmts_layer(resource, capabilitiesUrl, layerName, crs, logger, timeout):
 
     global capabilites_cache
 
     if not capabilites_cache.lookup(capabilitiesUrl):
         try:
-            response = urllib.request.urlopen(capabilitiesUrl)
+            response = urllib.request.urlopen(capabilitiesUrl, timeout=timeout)
         except:
             logger.warn("Failed to download capabilities for external layer %s" % resource)
             return None

src/config_generator/map_viewer_config.py

@@ -93,6 +93,10 @@ def __init__(self, tenant_path, generator_config, themes_reader,
             "generate_thumbnail_timeout", 10
         )
 
+        self.project_settings_read_timeout = generator_config.get(
+            "project_settings_read_timeout", 60
+        )
+
         # keep track of theme IDs for uniqueness
         self.theme_ids = []
 
@@ -280,15 +284,15 @@ def qwc2_themes(self, assets_dir):
                 self.logger.warn("Skipping unused background layer %s" % entry.get("name", ""))
                 continue
             if "resource" in entry:
-                layer = resolve_external_layer(entry["resource"], self.logger, bgLayerCrs[entry["name"]])
+                layer = resolve_external_layer(entry["resource"], self.logger, self.project_settings_read_timeout, bgLayerCrs[entry["name"]])
                 if layer:
                     layer["name"] = entry["name"]
                     entry.update(layer)
                     del entry["resource"]
 
         # Resolve external layers
         for entry in autogenExternalLayers:
-            layer = resolve_external_layer(entry, self.logger)
+            layer = resolve_external_layer(entry, self.logger, self.project_settings_read_timeout)
             if layer:
                 themes["externalLayers"].append(layer)