Merge pull request #605 from geoadmin/develop

New Release v2.2.0 - #minor

Author: adk-swisstopo

README.md

@@ -506,8 +506,9 @@ The service is configured by Environment Variable:
 | STAC_BROWSER_BASE_PATH | `browser/index.html` | STAC Browser base path. |
 | GUNICORN_WORKERS | `2` | Number of Gunicorn workers |
 | GUNICORN_WORKER_TMP_DIR | `None` | Path to a tmpfs directory for Gunicorn. If `None` let gunicorn decide which path to use. See https://docs.gunicorn.org/en/stable/settings.html#worker-tmp-dir. |
-| GUNICORN_STACK_DUMP_DELAY | `29` | Upon exit, how long to wait before logging stack traces. The default is one second less than `GUNICORN_GRACEFUL_TIMEOUT`. Setting this to a value equal or greater to `GUNICORN_GRACEFUL_TIMEOUT` effectively disables stack dumping.
-| GUNICORN_GRACEFUL_TIMEOUT | `30` | The [`graceful_timeout`](https://docs.gunicorn.org/en/stable/settings.html#graceful-timeout) setting passed to gunicorn.
+| GUNICORN_STACK_DUMP_DELAY | `29` | Upon exit, how long to wait before logging stack traces. The default is one second less than `GUNICORN_GRACEFUL_TIMEOUT`. Setting this to a value equal or greater to `GUNICORN_GRACEFUL_TIMEOUT` effectively disables stack dumping. |
+| GUNICORN_GRACEFUL_TIMEOUT | `30` | The [`graceful_timeout`](https://docs.gunicorn.org/en/stable/settings.html#graceful-timeout) setting passed to gunicorn. |
+| GUNICORN_KEEPALIVE | `2` | The [`keepalive`](https://docs.gunicorn.org/en/stable/settings.html#keepalive) setting passed to gunicorn. |
 
 #### **Database settings**
 
@@ -544,6 +545,7 @@ These settings are read from `settings_dev.py`
 
 | Env         | Default               | Description                            |
 |-------------|-----------------------|----------------------------------------|
+| CHECKER_DELAY | `0`                 | Delay the response of the checker endpoint by that number of seconds. |
 | DEBUG | `False` | Set django DEBUG flag |
 | DEBUG_PROPAGATE_API_EXCEPTIONS | `False` | When `True` the API exception are treated as in production, using a JSON response. Otherwise in DEBUG mode the API exception returns an HTML response with backtrace. |
 | EXTERNAL_TEST_ASSET_URL | `"https://prod-[...].jpg"`  | The URL of an externally hosted jpg file that's used in the external asset tests |

app/config/settings_prod.py

@@ -378,3 +378,7 @@ def get_logging_config():
 SESSION_COOKIE_AGE = env('SESSION_COOKIE_AGE', int, default=60 * 60 * 24 * 7 * 2)
 SESSION_COOKIE_SAMESITE = env('SESSION_COOKIE_SAMESITE', str, default='Lax')
 SESSION_COOKIE_SECURE = env('SESSION_COOKIE_SECURE', bool, default=False)
+
+# Delay to inject in the checker endpoint, in seconds. This is only meant to be
+# used for test purpose.
+CHECKER_DELAY = env('CHECKER_DELAY', int, default=0)

app/config/urls.py

@@ -13,6 +13,8 @@
     1. Import the include() function: from django.urls import include, path
     2. Add a URL to urlpatterns:  path('blog/', include('blog.urls'))
 """
+import time
+
 from django.conf import settings
 from django.contrib import admin
 from django.http import JsonResponse
@@ -23,6 +25,9 @@
 
 
 def checker(request):
+    if settings.CHECKER_DELAY > 0:
+        time.sleep(settings.CHECKER_DELAY)
+
     data = {"success": True, "message": "OK"}
 
     return JsonResponse(data)

app/tests/test_checker.py

@@ -0,0 +1,23 @@
+import time
+
+from django.test import Client
+from django.test import TestCase
+from django.test import override_settings
+
+
+class CheckerTestCase(TestCase):
+
+    def setUp(self):
+        self.client = Client()
+
+    def test_checker(self):
+        response = self.client.get('/checker')
+        self.assertEqual(response.status_code, 200)
+
+    @override_settings(CHECKER_DELAY=2)
+    def test_checker_delayed(self):
+        start = time.time()
+        response = self.client.get('/checker')
+        end = time.time()
+        self.assertEqual(response.status_code, 200)
+        self.assertGreater(end, start + 2, f'Expected at least 2s, only took {end - start}')

app/wsgi.py

@@ -100,6 +100,7 @@ def dump_stacks():
         'worker_tmp_dir': os.environ.get('GUNICORN_WORKER_TMP_DIR', None),
         'timeout': 60,
         'graceful_timeout': int(os.environ.get('GUNICORN_GRACEFUL_TIMEOUT', 30)),
+        'keepalive': int(os.environ.get('GUNICORN_KEEPALIVE', 2)),
         'logconfig_dict': get_logging_config(),
     }
     StandaloneApplication(application, options).run()