Merge branch 'release/1.5.2'

uccser · Nov 3, 2019 · df1d4dc · df1d4dc
2 parents 9c2152e + 96fa812
commit df1d4dc
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git 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
@@ -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

diff --git 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
@@ -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
@@ -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"