Merge branch 'bugfix-mapcache-locking' into 'master'

Fix mapcache config having conflicting options for blank detection

See merge request cspp_geo/cspp-geo-web-viewer!25

mapcache/Dockerfile

@@ -57,7 +57,7 @@ RUN mkdir -p /build_deps && cd /build_deps \
   && git checkout c467a3bb444cab69c52bc78b91b9bae3a9415f2f \
   && mkdir -p build && cd build \
   && cmake .. \
-# -DWITH_MEMCACHE=1 -DCMAKE_BUILD_TYPE="Debug" \
+#  && cmake -DCMAKE_BUILD_TYPE="Debug" .. \
   && make -j$(nproc) \
   && make install
 

mapcache/mapcache_template.xml

@@ -25,14 +25,6 @@
    <cache name="disk" type="disk">
       <base>{{ cache_disk_base }}</base>
       <symlink_blank/>
-      <!-- detect_blank
-          Similar to symlink_blank, except completely skip writing a file
-          if a blank, fully transparent tile is detected.
-          Note: This setting should only be used when using the seeder.  If used
-          on demand, mapcache will will query the WMS source on each subsequent
-          tile request.
-      -->
-      <detect_blank/>
    </cache>
 
 
@@ -339,7 +331,7 @@
    
    
    <locker type="disk">  <!-- this is the default -->
-     <directory>/tmp</directory>
+     <directory>{{ lock_disk_base }}</directory>
      <retry>0.01</retry> <!-- check back every .01 seconds -->
    </locker>
    <threaded_fetching>true</threaded_fetching>

mapcache/render.py

@@ -28,6 +28,7 @@ basemap_autoexpire = os.getenv("BASEMAP_AUTOEXPIRE", "0")
 wms_host = os.environ['WMS_HOST']
 wms_port = os.environ['WMS_PORT']
 cache_disk_base = os.environ['CACHE_DISK_BASE']
+lock_disk_base = os.getenv('LOCK_DISK_BASE', '/tmp')
 
 
 PLATFORM_LONG_NAMES = {
@@ -66,6 +67,7 @@ def main():
         'wms_host': wms_host,
         'wms_port': wms_port,
         'cache_disk_base': cache_disk_base,
+        'lock_disk_base': lock_disk_base,
         'PLATFORM_LONG_NAMES': PLATFORM_LONG_NAMES,
         'PLATFORM_EPSGS': PLATFORM_EPSGS,
         'PLATFORM_POS_NAMES': PLATFORM_POS_NAMES,

mapcache/site-conf

@@ -16,6 +16,7 @@
         # It is also possible to configure the loglevel for particular
         # modules, e.g.
         #LogLevel info ssl:warn
+        #LogLevel debug
 
         ErrorLog ${APACHE_LOG_DIR}/error.log
         CustomLog ${APACHE_LOG_DIR}/access.log combined