From 68e6efdad0bb17abdcc28a52809cef7c7edcb1f4 Mon Sep 17 00:00:00 2001 From: jimmoffet Date: Thu, 8 Sep 2022 09:07:54 -0700 Subject: [PATCH] remove redis debug config var --- app/config.py | 3 -- app/main/views/platform_admin.py | 34 ++++++------------- app/notify_client/job_api_client.py | 13 +++---- app/notify_client/organisations_api_client.py | 10 +++--- app/notify_client/service_api_client.py | 11 +++--- .../template_folder_api_client.py | 4 +-- 6 files changed, 25 insertions(+), 50 deletions(-) diff --git a/app/config.py b/app/config.py index 4e557b704..c2b14ca84 100644 --- a/app/config.py +++ b/app/config.py @@ -11,8 +11,6 @@ if os.environ.get('VCAP_APPLICATION'): class Config(object): - NOTIFY_ADMIN_API_CACHE_ENABLED = False # TODO: remove when redis is fixed on remote - ADMIN_CLIENT_SECRET = os.environ.get('ADMIN_CLIENT_SECRET') ADMIN_CLIENT_USER_NAME = os.environ.get('ADMIN_CLIENT_USERNAME') API_HOST_NAME = os.environ.get('API_HOST_NAME', 'localhost') @@ -130,7 +128,6 @@ class Development(Config): class Test(Development): - NOTIFY_ADMIN_API_CACHE_ENABLED = True BASIC_AUTH_FORCE = False DEBUG = True TESTING = True diff --git a/app/main/views/platform_admin.py b/app/main/views/platform_admin.py index be00c2be8..260a2e486 100644 --- a/app/main/views/platform_admin.py +++ b/app/main/views/platform_admin.py @@ -3,15 +3,7 @@ import re from collections import OrderedDict from datetime import datetime -from flask import ( - abort, - current_app, - flash, - redirect, - render_template, - request, - url_for, -) +from flask import abort, flash, redirect, render_template, request, url_for from notifications_python_client.errors import HTTPError from app import ( @@ -468,13 +460,12 @@ def platform_admin_returned_letters(): try: letter_jobs_client.submit_returned_letters(references) - if current_app.config['NOTIFY_ADMIN_API_CACHE_ENABLED']: - redis_client.delete_by_pattern( - 'service-????????-????-????-????-????????????-returned-letters-statistics' - ) - redis_client.delete_by_pattern( - 'service-????????-????-????-????-????????????-returned-letters-summary' - ) + redis_client.delete_by_pattern( + 'service-????????-????-????-????-????????????-returned-letters-statistics' + ) + redis_client.delete_by_pattern( + 'service-????????-????-????-????-????????????-returned-letters-summary' + ) except HTTPError as error: if error.status_code == 400: error_references = [ @@ -547,13 +538,10 @@ def clear_cache(): groups = map(CACHE_KEYS.get, group_keys) patterns = list(itertools.chain(*groups)) - if current_app.config['NOTIFY_ADMIN_API_CACHE_ENABLED']: - num_deleted = sum( - redis_client.delete_by_pattern(pattern) - for pattern in patterns - ) - else: - num_deleted = 0 + num_deleted = sum( + redis_client.delete_by_pattern(pattern) + for pattern in patterns + ) msg = ( f'Removed {num_deleted} objects ' diff --git a/app/notify_client/job_api_client.py b/app/notify_client/job_api_client.py index f0c8a0b72..60a2d295e 100644 --- a/app/notify_client/job_api_client.py +++ b/app/notify_client/job_api_client.py @@ -1,5 +1,3 @@ -from flask import current_app - from app.extensions import redis_client from app.notify_client import NotifyAdminAPIClient, _attach_current_user, cache @@ -102,12 +100,11 @@ class JobApiClient(NotifyAdminAPIClient): data = _attach_current_user(data) job = self.post(url='/service/{}/job'.format(service_id), data=data) - if current_app.config['NOTIFY_ADMIN_API_CACHE_ENABLED']: - redis_client.set( - 'has_jobs-{}'.format(service_id), - b'true', - ex=int(cache.DEFAULT_TTL), - ) + redis_client.set( + 'has_jobs-{}'.format(service_id), + b'true', + ex=int(cache.DEFAULT_TTL), + ) return job diff --git a/app/notify_client/organisations_api_client.py b/app/notify_client/organisations_api_client.py index 34ccd588a..d34950d11 100644 --- a/app/notify_client/organisations_api_client.py +++ b/app/notify_client/organisations_api_client.py @@ -1,6 +1,5 @@ from itertools import chain -from flask import current_app from notifications_python_client.errors import HTTPError from app.extensions import redis_client @@ -54,12 +53,11 @@ class OrganisationsClient(NotifyAdminAPIClient): def update_organisation(self, org_id, cached_service_ids=None, **kwargs): api_response = self.post(url="/organisations/{}".format(org_id), data=kwargs) - if current_app.config['NOTIFY_ADMIN_API_CACHE_ENABLED']: - if cached_service_ids: - redis_client.delete(*map('service-{}'.format, cached_service_ids)) + if cached_service_ids: + redis_client.delete(*map('service-{}'.format, cached_service_ids)) - if 'name' in kwargs: - redis_client.delete(f'organisation-{org_id}-name') + if 'name' in kwargs: + redis_client.delete(f'organisation-{org_id}-name') return api_response diff --git a/app/notify_client/service_api_client.py b/app/notify_client/service_api_client.py index c69fd26c1..e3e9a4a84 100644 --- a/app/notify_client/service_api_client.py +++ b/app/notify_client/service_api_client.py @@ -1,6 +1,5 @@ from datetime import datetime -from flask import current_app from notifications_utils.clients.redis import daily_limit_cache_key from app.extensions import redis_client @@ -139,7 +138,7 @@ class ServiceAPIClient(NotifyAdminAPIClient): # @cache.delete('service-{service_id}-templates') # @cache.delete_by_pattern('service-{service_id}-template-*') def archive_service(self, service_id, cached_service_user_ids): - if cached_service_user_ids and current_app.config['NOTIFY_ADMIN_API_CACHE_ENABLED']: + if cached_service_user_ids: redis_client.delete(*map('user-{}'.format, cached_service_user_ids)) return self.post('/service/{}/archive'.format(service_id), data=None) @@ -596,7 +595,7 @@ class ServiceAPIClient(NotifyAdminAPIClient): broadcast channel is one of "operator", "test", "severe", "government" provider_restriction is one of "all", "three", "o2", "vodafone", "ee" """ - if cached_service_user_ids and current_app.config['NOTIFY_ADMIN_API_CACHE_ENABLED']: + if cached_service_user_ids: redis_client.delete(*map('user-{}'.format, cached_service_user_ids)) data = { @@ -610,10 +609,8 @@ class ServiceAPIClient(NotifyAdminAPIClient): def get_notification_count(self, service_id): # if cache is not set, or not enabled, return 0 - if current_app.config['NOTIFY_ADMIN_API_CACHE_ENABLED']: - count = redis_client.get(daily_limit_cache_key(service_id)) or 0 - else: - count = 0 + count = redis_client.get(daily_limit_cache_key(service_id)) or 0 + return int(count) diff --git a/app/notify_client/template_folder_api_client.py b/app/notify_client/template_folder_api_client.py index dbf0ccc40..1975efe87 100644 --- a/app/notify_client/template_folder_api_client.py +++ b/app/notify_client/template_folder_api_client.py @@ -1,5 +1,3 @@ -from flask import current_app - from app.extensions import redis_client from app.notify_client import NotifyAdminAPIClient @@ -50,7 +48,7 @@ class TemplateFolderAPIClient(NotifyAdminAPIClient): 'folders': list(folder_ids), }) - if template_ids and current_app.config['NOTIFY_ADMIN_API_CACHE_ENABLED']: + if template_ids: redis_client.delete(*(f'service-{service_id}-template-{id}-version-None' for id in template_ids)) # @cache.delete('service-{service_id}-template-folders')