mirror of
https://github.com/GSA/notifications-admin.git
synced 2026-08-24 16:24:08 -04:00
clean up
This commit is contained in:
@@ -1,6 +1,5 @@
|
|||||||
import os
|
import os
|
||||||
from app.notify_client import NotifyAdminAPIClient, cache
|
from app.notify_client import NotifyAdminAPIClient, cache
|
||||||
from flask import current_app
|
|
||||||
|
|
||||||
class StatusApiClient(NotifyAdminAPIClient):
|
class StatusApiClient(NotifyAdminAPIClient):
|
||||||
|
|
||||||
@@ -11,8 +10,5 @@ class StatusApiClient(NotifyAdminAPIClient):
|
|||||||
def get_count_of_live_services_and_organisations(self):
|
def get_count_of_live_services_and_organisations(self):
|
||||||
return self.get(url='/_status/live-service-and-organisation-counts')
|
return self.get(url='/_status/live-service-and-organisation-counts')
|
||||||
|
|
||||||
def get_services(self):
|
|
||||||
return self.get(url='/service')
|
|
||||||
|
|
||||||
|
|
||||||
status_api_client = StatusApiClient()
|
status_api_client = StatusApiClient()
|
||||||
|
|||||||
@@ -20,29 +20,3 @@ def show_status():
|
|||||||
api=api_status,
|
api=api_status,
|
||||||
git_commit=version.__git_commit__,
|
git_commit=version.__git_commit__,
|
||||||
build_time=version.__time__), 200
|
build_time=version.__time__), 200
|
||||||
|
|
||||||
@status.route('/_status/servicecounts', methods=['GET'])
|
|
||||||
def get_counts():
|
|
||||||
try:
|
|
||||||
orgs_status = status_api_client.get_count_of_live_services_and_organisations()
|
|
||||||
except HTTPError as e:
|
|
||||||
current_app.logger.exception("API failed to respond")
|
|
||||||
return jsonify(status="error", message=str(e.message)), 500
|
|
||||||
return jsonify(
|
|
||||||
status="ok",
|
|
||||||
api=orgs_status,
|
|
||||||
git_commit=version.__git_commit__,
|
|
||||||
build_time=version.__time__), 200
|
|
||||||
|
|
||||||
@status.route('/_status/services', methods=['GET'])
|
|
||||||
def get_services():
|
|
||||||
try:
|
|
||||||
services = status_api_client.get_services()
|
|
||||||
except HTTPError as e:
|
|
||||||
current_app.logger.exception("API failed to respond")
|
|
||||||
return jsonify(status="error", message=str(e.message)), 500
|
|
||||||
return jsonify(
|
|
||||||
status="ok",
|
|
||||||
api=services,
|
|
||||||
git_commit=version.__git_commit__,
|
|
||||||
build_time=version.__time__), 200
|
|
||||||
|
|||||||
Reference in New Issue
Block a user