Upgrade to GeoMapFish 2.5

camptocamp · Jan 14, 2020 · f44fdf7 · f44fdf7
1 parent 2c4cdcc
commit f44fdf7
Show file tree

Hide file tree

Showing 8 changed files with 52 additions and 8 deletions.
diff --git a/CONST_create_template/docker-compose-lib.yaml b/CONST_create_template/docker-compose-lib.yaml
@@ -74,6 +74,10 @@ services:
       - CPL_VSIL_CURL_USE_HEAD
       - GDAL_DISABLE_READDIR_ON_OPEN
       - QGIS_SERVER_LOG_LEVEL=2
+      - LOG_LEVEL=INFO
+      - C2CGEOPORTAL_LOG_LEVEL=INFO
+      - SQL_LOG_LEVEL=WARN
+      - OTHER_LOG_LEVEL=WARN
 
   tinyows:
     image: camptocamp/tinyows

diff --git a/CONST_create_template/docker-compose.override.sample.yaml b/CONST_create_template/docker-compose.override.sample.yaml
@@ -13,7 +13,7 @@ services:
       # For Python project development.
       - ${PWD}/geoportal/geomapfish_geoportal:/app/geomapfish_geoportal
       # For Python c2cgeportal development.
-      # - '${PWD}/../c2cgeoportal/commons/c2cgeoportal_gcommons:/opt/c2cgeoportal/commons/c2cgeoportal_commons'
+      # - '${PWD}/../c2cgeoportal/commons/c2cgeoportal_commons:/opt/c2cgeoportal/commons/c2cgeoportal_commons'
       # - '${PWD}/../c2cgeoportal/geoportal/c2cgeoportal_geoportal:/opt/c2cgeoportal/geoportal/c2cgeoportal_geoportal'
       # - '${PWD}/../c2cgeoportal/admin/c2cgeoportal_admin:/opt/c2cgeoportal/admin/c2cgeoportal_admin'
     environment:
@@ -31,10 +31,12 @@ services:
   #   volumes_from:
   #     - config:ro
 
-  # qgisserver:
-  #   environment:
-  #     env:
-  #       - QGIS_SERVER_LOG_LEVEL=0
+  qgisserver:
+    # volumes:
+    #   - '${PWD}/../c2cgeoportal/docker/qgisserver/geomapfish_qgisserver/:/var/www/plugins/geomapfish_qgisserver/'
+    #   - '${PWD}/../c2cgeoportal/commons/c2cgeoportal_commons:/opt/c2cgeoportal/commons/c2cgeoportal_commons/'
+    environment:
+      - QGIS_SERVER_LOG_LEVEL=0
 
   # For Javascript project development.
   # The debug application will be availavble at ``https://<host>/<entry_point>/dev/<interface>.html``.

diff --git a/CONST_create_template/qgisserver/geomapfish.yaml b/CONST_create_template/qgisserver/geomapfish.yaml
@@ -3,11 +3,18 @@ vars:
   schema: '{PGSCHEMA}'
   schema_static: '{PGSCHEMA_STATIC}'
   sqlalchemy.url: postgresql://{PGUSER}:{PGPASSWORD}@{PGHOST}:{PGPORT}/{PGDATABASE}
+  sqlalchemy_slave.url: postgresql://{PGUSER}:{PGPASSWORD}@{PGHOST_SLAVE}:{PGPORT}/{PGDATABASE}
   srid: 2056
+  sqlalchemy:
+    pool_recycle: 30
+    pool_size: 5
+    max_overflow: 25
+    use_batch_mode: true
 environment:
   - PGUSER
   - PGPASSWORD
   - PGHOST
+  - PGHOST_SLAVE
   - name: PGPORT
     default: 5432
   - PGDATABASE

diff --git a/docker-compose-lib.yaml b/docker-compose-lib.yaml
@@ -74,6 +74,10 @@ services:
       - CPL_VSIL_CURL_USE_HEAD
       - GDAL_DISABLE_READDIR_ON_OPEN
       - QGIS_SERVER_LOG_LEVEL=2
+      - LOG_LEVEL=INFO
+      - C2CGEOPORTAL_LOG_LEVEL=INFO
+      - SQL_LOG_LEVEL=WARN
+      - OTHER_LOG_LEVEL=WARN
 
   tinyows:
     image: camptocamp/tinyows

diff --git a/docker-compose.override.sample.yaml b/docker-compose.override.sample.yaml
@@ -13,7 +13,7 @@ services:
       # For Python project development.
       - ${PWD}/geoportal/geomapfish_geoportal:/app/geomapfish_geoportal
       # For Python c2cgeportal development.
-      # - '${PWD}/../c2cgeoportal/commons/c2cgeoportal_gcommons:/opt/c2cgeoportal/commons/c2cgeoportal_commons'
+      # - '${PWD}/../c2cgeoportal/commons/c2cgeoportal_commons:/opt/c2cgeoportal/commons/c2cgeoportal_commons'
       # - '${PWD}/../c2cgeoportal/geoportal/c2cgeoportal_geoportal:/opt/c2cgeoportal/geoportal/c2cgeoportal_geoportal'
       # - '${PWD}/../c2cgeoportal/admin/c2cgeoportal_admin:/opt/c2cgeoportal/admin/c2cgeoportal_admin'
       # - '${PWD}/../c2cwsgiutils/c2cwsgiutils:/opt/c2cwsgiutils/c2cwsgiutils'

diff --git a/geoportal/CONST_config-schema.yaml b/geoportal/CONST_config-schema.yaml
@@ -621,7 +621,7 @@ mapping:
                 required: True
                 seq:
                   - type: map
-                    mapping:
+                    mapping: &route
                       level:
                         type: int
                         required: True
@@ -637,7 +637,23 @@ mapping:
                             type: str
                             pattern: |-
                               [a-zA-Z0-9_\-~\.]+
-          phantomjs: *routes
+          phantomjs:
+            type: map
+            required: True
+            mapping:
+              disable:
+                type: seq
+                required: True
+                seq:
+                  - type: str
+              routes:
+                type: seq
+                required: True
+                seq:
+                  - type: map
+                    mapping:
+                      <<: *route
+                      environment: *free_dict
           themes:
             type: map
             required: True

diff --git a/geoportal/CONST_vars.yaml b/geoportal/CONST_vars.yaml
@@ -593,16 +593,22 @@ vars:
         - name: desktop
           params:
             no_redirect: "true"
+          environment: &phantomjs-env
+            HTTP_MAP:
+              https://localhost:8484/tiles/: http://localhost:8080/tiles/
           level: 6
         - name: mobile
           params:
             no_redirect: "true"
+          environment: *phantomjs-env
           level: 6
         - name: iframe_api
           params:
             no_redirect: "true"
+          environment: *phantomjs-env
           level: 6
         - name: apihelp
+          environment: *phantomjs-env
           level: 6
     routes:
       disable: []

diff --git a/qgisserver/geomapfish.yaml b/qgisserver/geomapfish.yaml
@@ -5,6 +5,11 @@ vars:
   sqlalchemy.url: postgresql://{PGUSER}:{PGPASSWORD}@{PGHOST}:{PGPORT}/{PGDATABASE}
   sqlalchemy_slave.url: postgresql://{PGUSER}:{PGPASSWORD}@{PGHOST_SLAVE}:{PGPORT}/{PGDATABASE}
   srid: 2056
+  sqlalchemy:
+    pool_recycle: 30
+    pool_size: 5
+    max_overflow: 25
+    use_batch_mode: true
 environment:
   - PGUSER
   - PGPASSWORD