Merge pull request #55 from camptocamp/backport/52-to-master

Be able to configure the timeout

Author: sbrunner

Dockerfile

@@ -117,12 +117,12 @@ ENV QGIS_SERVER_LOG_LEVEL=0 \
     MAX_CACHE_LAYERS="" \
     QGIS_PLUGINPATH=/var/www/plugins \
     QGIS_AUTH_DB_DIR_PATH=/etc/qgisserver/ \
-    MAX_REQUESTS_PER_PROCESS=1000 \
-    MIN_PROCESSES=1 \
-    MAX_PROCESSES=5 \
-    BUSY_TIMEOUT=300 \
-    IDLE_TIMEOUT=300 \
-    IO_TIMEOUT=40
+    FCGID_MAX_REQUESTS_PER_PROCESS=1000 \
+    FCGID_MIN_PROCESSES=1 \
+    FCGID_MAX_PROCESSES=5 \
+    FCGID_BUSY_TIMEOUT=300 \
+    FCGID_IDLE_TIMEOUT=300 \
+    FCGID_IO_TIMEOUT=40
 
 COPY --from=builder /usr/local/bin /usr/local/bin/
 COPY --from=builder /usr/local/lib /usr/local/lib/

README.md

@@ -19,15 +19,16 @@ You can use the following variables (`-e` option in `docker run`):
 * QGIS_SERVER_LOG_LEVEL: The debug level for the logs (0=max debug, 3=no debug logs)
 * PGSERVICEFILE: If you want to change the default of `/etc/qgisserver/pg_service.conf`
 * QGIS_PROJECT_FILE: If you want to change the default of `/etc/qgisserver/project.qgs`
-* MAX_REQUESTS_PER_PROCESS: The number of requests a QGIS server will serve before being restarted by apache
-* MIN_PROCESSES: The minimum number of fcgi processes to keep (defaults to 1)
-* MAX_PROCESSES: The maximum number of fcgi processes to keep (defaults to 5)
 * QGIS_CATCH_SEGV: Set to "1" if you want stacktraces in the logs in case of segmentation faults.
-* BUSY_TIMEOUT: The maximum time limit for request handling (defaults to 300)
-* IDLE_TIMEOUT: Application processes which have not handled a request for
-this period of time will be terminated (defaults to 300)
-* IO_TIMEOUT: The maximum period of time the module will wait while trying to
-read from or write to a FastCGI application (defaults to 40)
+* FCGID_MAX_REQUESTS_PER_PROCESS: The number of requests a QGIS server will serve before being restarted by apache
+* FCGID_MIN_PROCESSES: The minimum number of fcgi processes to keep (defaults to 1)
+* FCGID_MAX_PROCESSES: The maximum number of fcgi processes to keep (defaults to 5)
+* FCGID_IO_TIMEOUT: This is the maximum period of time the module will wait while trying to read from or
+  write to a FastCGI application (default to 40)
+* FCGID_BUSY_TIMEOUT: The maximum time limit for request handling (defaults to 300)
+* FCGID_IDLE_TIMEOUT: Application processes which have not handled a request for
+  this period of time will be terminated (defaults to 300)
+
 Fonts present in the `/etc/qgisserver/fonts` directory will be installed and thus usable by QGIS.
 
 ## Running the client

runtime/etc/apache2/conf-enabled/qgis.conf

@@ -1,10 +1,10 @@
 # QGIS has memory leaks, this limit should improve long term memory usage
-FcgidMaxRequestsPerProcess ${MAX_REQUESTS_PER_PROCESS}
-FcgidMinProcessesPerClass ${MIN_PROCESSES}
-FcgidMaxProcessesPerClass ${MAX_PROCESSES}
-FcgidBusyTimeout ${BUSY_TIMEOUT}
-FcgidIdleTimeout ${IDLE_TIMEOUT}
-FcgidIOTimeout ${IO_TIMEOUT}
+FcgidMaxRequestsPerProcess ${FCGID_MAX_REQUESTS_PER_PROCESS}
+FcgidMinProcessesPerClass ${FCGID_MIN_PROCESSES}
+FcgidMaxProcessesPerClass ${FCGID_MAX_PROCESSES}
+FcgidBusyTimeout ${FCGID_BUSY_TIMEOUT}
+FcgidIdleTimeout ${FCGID_IDLE_TIMEOUT}
+FcgidIOTimeout ${FCGID_IO_TIMEOUT}
 
 ScriptAliasMatch "^/.*" /usr/local/bin/qgis-mapserv-wrapper
 <LocationMatch "^/.*">