Merge pull request #100 from geoadmin/develop

New Release v1.5.3 - #patch

Author: sami-nouidri-swisstopo

Dockerfile

@@ -1,4 +1,3 @@
-# Buster slim python 3.12 base image.
 FROM python:3.12-slim-bookworm
 ENV HTTP_PORT 8080
 RUN groupadd -r geoadmin && useradd -r -s /bin/false -g geoadmin geoadmin

README.md

@@ -2,8 +2,8 @@
 
 | Branch  | Status                                                                                                                                                                                                                                                                                                                      |
 | ------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| develop | ![Build Status](https://codebuild.eu-central-1.amazonaws.com/badges?uuid=eyJlbmNyeXB0ZWREYXRhIjoianNmckV3aUxNR01rMDBCNWpwQlBjY3lvRDh0d1pXeExJc0EzTG82d0IxbUJYNEVjaDdiR3VsY1VqS1dXVlFQOHBsZW81cVo3WTkvOHVnd1dreC9sWDZFPSIsIml2UGFyYW1ldGVyU3BlYyI6IkNLS1hoTFB1bitMQkYxNTEiLCJtYXRlcmlhbFNldFNlcmlhbCI6MX0%3D&branch=develop) |
-| master  | ![Build Status](https://codebuild.eu-central-1.amazonaws.com/badges?uuid=eyJlbmNyeXB0ZWREYXRhIjoianNmckV3aUxNR01rMDBCNWpwQlBjY3lvRDh0d1pXeExJc0EzTG82d0IxbUJYNEVjaDdiR3VsY1VqS1dXVlFQOHBsZW81cVo3WTkvOHVnd1dreC9sWDZFPSIsIml2UGFyYW1ldGVyU3BlYyI6IkNLS1hoTFB1bitMQkYxNTEiLCJtYXRlcmlhbFNldFNlcmlhbCI6MX0%3D&branch=master)  |
+| develop | ![Build Status](https://codebuild.eu-central-1.amazonaws.com/badges?uuid=eyJlbmNyeXB0ZWREYXRhIjoiRmo5bFozbUlSKzdZQ2xIQ1JYL1lDKzBJM2hNS2FBZkNVeFo1WS82ZnNrL2hjVHRqTTJzYmJWRGxaRGdTeFRmWFFDYlNIeU5sa3FDVVVIMjlBMHFtL1BZPSIsIml2UGFyYW1ldGVyU3BlYyI6ImdSMlBoSEJZYlBVYW9UVVIiLCJtYXRlcmlhbFNldFNlcmlhbCI6MX0%3D&branch=develop) |
+| master  | ![Build Status](https://codebuild.eu-central-1.amazonaws.com/badges?uuid=eyJlbmNyeXB0ZWREYXRhIjoiRmo5bFozbUlSKzdZQ2xIQ1JYL1lDKzBJM2hNS2FBZkNVeFo1WS82ZnNrL2hjVHRqTTJzYmJWRGxaRGdTeFRmWFFDYlNIeU5sa3FDVVVIMjlBMHFtL1BZPSIsIml2UGFyYW1ldGVyU3BlYyI6ImdSMlBoSEJZYlBVYW9UVVIiLCJtYXRlcmlhbFNldFNlcmlhbCI6MX0%3D&branch=master)  |
 
 ## Table of content
 
@@ -193,3 +193,4 @@ The service is configured by Environment Variable:
 | GUNICORN_TMPFS_DIR | `None` |The working directory for the gunicorn workers. |
 | WSGI_WORKERS | `2` | The number of workers per CPU. | 
 | UNLISTED_ICON_SETS | | Comma separated list of icon set to un-list. Those sets won't be listed in the /sets endpoint.  |
+| GUNICORN_KEEPALIVE | `2` | The [`keepalive`](https://docs.gunicorn.org/en/stable/settings.html#keepalive) setting passed to gunicorn. |

app/settings.py

@@ -28,6 +28,8 @@
 os.environ['LOGS_DIR'] = LOGS_DIR  # Set default if not set
 LOGGING_CFG = os.getenv('LOGGING_CFG', 'logging-cfg-local.yml')
 
+GUNICORN_KEEPALIVE = int(os.getenv('GUNICORN_KEEPALIVE', '2'))
+
 # Definition of the allowed domains for CORS implementation
 ALLOWED_DOMAINS = os.getenv('ALLOWED_DOMAINS', r'.*').split(',')
 CACHE_CONTROL = os.getenv('CACHE_CONTROL', 'public, max-age=86400')

wsgi.py

@@ -4,6 +4,7 @@
 
 from app import app as application
 from app.helpers import get_logging_cfg
+from app.settings import GUNICORN_KEEPALIVE
 
 
 class StandaloneApplication(BaseApplication):  # pylint: disable=abstract-method
@@ -36,6 +37,7 @@ def load(self):
         'workers': int(os.getenv('WSGI_WORKERS',
                                  '2')),  # scaling horizontally is left to Kubernetes
         'timeout': int(os.getenv('WSGI_TIMEOUT', '5')),
+        'keepalive': GUNICORN_KEEPALIVE,
         'logconfig_dict': get_logging_cfg(),
         'forwarded_allow_ips': os.getenv('FORWARED_ALLOW_IPS', '*'),
         'secure_scheme_headers': {