From 27bbd275045833d80b902b3b87ccb751e3564300 Mon Sep 17 00:00:00 2001 From: JackMorganNZ Date: Mon, 4 Nov 2019 10:46:06 +1300 Subject: [PATCH 1/2] Update health check paths --- codewof/config/urls.py | 3 ++- infrastructure/dev-deploy/app.yaml | 6 ++---- infrastructure/prod-deploy/app.yaml | 6 ++---- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/codewof/config/urls.py b/codewof/config/urls.py index eeb8f4988..d2e408bd4 100644 --- a/codewof/config/urls.py +++ b/codewof/config/urls.py @@ -19,7 +19,8 @@ path('users/', include('users.urls', namespace='users'),), path('accounts/', include('allauth.urls')), path('', include('programming.urls', namespace='programming'),), - path('_ah/health', health_check), + path('gae/liveness_check', health_check), + path('gae/readiness_check', health_check), path('ckeditor/', include('ckeditor_uploader.urls')), ] + static( settings.MEDIA_URL, document_root=settings.MEDIA_ROOT diff --git a/infrastructure/dev-deploy/app.yaml b/infrastructure/dev-deploy/app.yaml index 404c17ed7..c8315c94d 100644 --- a/infrastructure/dev-deploy/app.yaml +++ b/infrastructure/dev-deploy/app.yaml @@ -25,12 +25,10 @@ resources: memory_gb: 3.75 liveness_check: - path: "/_ah/health" - check_interval_sec: 5 + path: "/gae/liveness_check" readiness_check: - path: "/_ah/health" - check_interval_sec: 5 + path: "/gae/readiness_check" manual_scaling: instances: 1 diff --git a/infrastructure/prod-deploy/app.yaml b/infrastructure/prod-deploy/app.yaml index 6d8e5722a..e23be6338 100644 --- a/infrastructure/prod-deploy/app.yaml +++ b/infrastructure/prod-deploy/app.yaml @@ -23,9 +23,7 @@ resources: memory_gb: 3.75 liveness_check: - path: "/_ah/health" - check_interval_sec: 5 + path: "/gae/liveness_check" readiness_check: - path: "/_ah/health" - check_interval_sec: 5 + path: "/gae/readiness_check" From 96fa8124f0169595909f969b78b507e448b80ab9 Mon Sep 17 00:00:00 2001 From: JackMorganNZ Date: Mon, 4 Nov 2019 11:32:02 +1300 Subject: [PATCH 2/2] Increment version number to 1.5.2 and update CHANGELOG --- CHANGELOG.md | 3 +++ codewof/config/__init__.py | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e45866618..2e945cc37 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Changelog +## 1.5.2 +- Split GCP health check URLs. + ## 1.5.1 - Update GCP health checks. diff --git a/codewof/config/__init__.py b/codewof/config/__init__.py index 90bf59248..79d2167d4 100644 --- a/codewof/config/__init__.py +++ b/codewof/config/__init__.py @@ -1,6 +1,6 @@ """Configuration for Django system.""" -__version__ = "1.5.1" +__version__ = "1.5.2" __version_info__ = tuple( [ int(num) if num.isdigit() else num