Merge pull request #1551 from rajeevbbqq/ropsten-phase-1

Health check only if the service is curated (Ropsten Phase 1)
singnet · Jun 2, 2021 · a694a06 · a694a06
2 parents da1f1fb + 8f62f0a
commit a694a06
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/service_status/monitor_service.py b/service_status/monitor_service.py
@@ -33,7 +33,7 @@ class MonitorService:
 
     def _get_service_endpoint_data(self, limit):
         query = "SELECT row_id, org_id, service_id, endpoint, is_available, failed_status_count FROM service_endpoint WHERE " \
-                "next_check_timestamp < UTC_TIMESTAMP AND endpoint not regexp %s ORDER BY last_check_timestamp ASC"
+                "next_check_timestamp < UTC_TIMESTAMP AND endpoint not regexp %s AND (org_id,service_id) IN (SELECT org_id, service_id FROM service WHERE service.is_curated=1) ORDER BY last_check_timestamp ASC"
         if limit is not None:
             query = query + " LIMIT %s"
             result = self.repo.execute(query, [self.rex_for_pb_ip, limit])

diff --git a/service_status/service_status.py b/service_status/service_status.py
@@ -60,7 +60,7 @@ def _ping_url(self, url):
 
     def _get_service_endpoint_data(self):
         query = "SELECT row_id, org_id, service_id, endpoint, is_available, failed_status_count FROM service_endpoint WHERE " \
-                "next_check_timestamp < UTC_TIMESTAMP AND endpoint not regexp %s ORDER BY last_check_timestamp ASC " \
+                "next_check_timestamp < UTC_TIMESTAMP AND endpoint not regexp %s AND (org_id,service_id) IN (SELECT org_id, service_id FROM service WHERE service.is_curated=1) ORDER BY last_check_timestamp ASC " \
                 "LIMIT %s"
         result = self.repo.execute(query, [self.rex_for_pb_ip, LIMIT])
         if result is None or result == []: