From f11adfc2b42672939bb91fd4ac8f3407c1e995a2 Mon Sep 17 00:00:00 2001
From: "alexander.pace@ligo.org" <alexander.pace@ligo.org>
Date: Wed, 12 Feb 2020 20:19:27 -0600
Subject: [PATCH] cherry picked caching settings
---
config/settings/container/base.py | 29 +++++++++++++------------
config/settings/container/dev.py | 17 +++++++++++++++
config/settings/container/playground.py | 17 +++++++++++++++
config/settings/container/production.py | 1 +
config/settings/container/test.py | 17 +++++++++++++++
5 files changed, 67 insertions(+), 14 deletions(-)
diff --git a/config/settings/container/base.py b/config/settings/container/base.py
index 6bd9dcbd3..8f643d8a2 100644
--- a/config/settings/container/base.py
+++ b/config/settings/container/base.py
@@ -84,20 +84,6 @@ AWS_SES_REGION_ENDPOINT = get_from_env('AWS_SES_REGION_ENDPOINT',
AWS_SES_AUTO_THROTTLE = 0.25
ALERT_EMAIL_FROM = get_from_env('DJANGO_ALERT_EMAIL_FROM')
-# AWS Elasticache settings:
-AWS_ELASTICACHE_ADDR = get_from_env('DJANGO_AWS_ELASTICACHE_ADDR')
-
-CACHES = {
- 'default': {
- 'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache',
- 'LOCATION': AWS_ELASTICACHE_ADDR,
- },
- # For API throttles
- 'throttles': {
- 'BACKEND': 'django.core.cache.backends.db.DatabaseCache',
- 'LOCATION': 'api_throttle_cache', # Table name
- },
-}
MIDDLEWARE = [
'core.middleware.maintenance.MaintenanceModeMiddleware',
@@ -115,6 +101,21 @@ MIDDLEWARE = [
'ligoauth.middleware.ShibbolethWebAuthMiddleware',
'ligoauth.middleware.ControlRoomMiddleware',
]
+#AWS_ELASTICACHE_ADDR = get_from_env('DJANGO_AWS_ELASTICACHE_ADDR')
+#
+#CACHES = {
+# 'default': {
+# 'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache',
+# 'LOCATION': AWS_ELASTICACHE_ADDR,
+# 'TIMEOUT': 30,
+# 'KEY_PREFIX': CONFIG_NAME,
+# },
+# # For API throttles
+# 'throttles': {
+# 'BACKEND': 'django.core.cache.backends.db.DatabaseCache',
+# 'LOCATION': 'api_throttle_cache', # Table name
+# },
+#}
# Priority server settings ----------------------------------------------------
diff --git a/config/settings/container/dev.py b/config/settings/container/dev.py
index df67e67bc..79154c6fc 100644
--- a/config/settings/container/dev.py
+++ b/config/settings/container/dev.py
@@ -88,3 +88,20 @@ Events and associated data may change or be removed at any time.
<li>LVAlert messages are sent to lvalert-dev.cgca.uwm.edu.</li>
</ul>
"""
+
+# AWS Elasticache settings:
+AWS_ELASTICACHE_ADDR = get_from_env('DJANGO_AWS_ELASTICACHE_ADDR')
+
+CACHES = {
+ 'default': {
+ 'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache',
+ 'LOCATION': AWS_ELASTICACHE_ADDR,
+ 'TIMEOUT': 30,
+ 'KEY_PREFIX': "1",
+ },
+ # For API throttles
+ 'throttles': {
+ 'BACKEND': 'django.core.cache.backends.db.DatabaseCache',
+ 'LOCATION': 'api_throttle_cache', # Table name
+ },
+}
diff --git a/config/settings/container/playground.py b/config/settings/container/playground.py
index 707af0928..3f2714036 100644
--- a/config/settings/container/playground.py
+++ b/config/settings/container/playground.py
@@ -42,3 +42,20 @@ A nightly cron job removes events older than 21 days.</li>
# Safety check on debug mode for playground
if (DEBUG == True):
raise RuntimeError("Turn off debug mode for playground")
+
+# AWS Elasticache settings:
+AWS_ELASTICACHE_ADDR = get_from_env('DJANGO_AWS_ELASTICACHE_ADDR')
+
+CACHES = {
+ 'default': {
+ 'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache',
+ 'LOCATION': AWS_ELASTICACHE_ADDR,
+ 'TIMEOUT': 30,
+ 'KEY_PREFIX': '3',
+ },
+ # For API throttles
+ 'throttles': {
+ 'BACKEND': 'django.core.cache.backends.db.DatabaseCache',
+ 'LOCATION': 'api_throttle_cache', # Table name
+ },
+}
diff --git a/config/settings/container/production.py b/config/settings/container/production.py
index 16fdfa04e..1e1b50e06 100644
--- a/config/settings/container/production.py
+++ b/config/settings/container/production.py
@@ -2,6 +2,7 @@
from .base import *
DEBUG = False
+CONFIG_NAME="PROD"
# Turn on alerts
SEND_XMPP_ALERTS = True
diff --git a/config/settings/container/test.py b/config/settings/container/test.py
index c2d62fbbf..f2731b0b2 100644
--- a/config/settings/container/test.py
+++ b/config/settings/container/test.py
@@ -88,3 +88,20 @@ to Playground or Production. Note, on this GraceDB instance:
<li>LVAlert messages are sent to lvalert-test.cgca.uwm.edu.</li>
</ul>
"""
+
+# AWS Elasticache settings:
+AWS_ELASTICACHE_ADDR = get_from_env('DJANGO_AWS_ELASTICACHE_ADDR')
+
+CACHES = {
+ 'default': {
+ 'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache',
+ 'LOCATION': AWS_ELASTICACHE_ADDR,
+ 'TIMEOUT': 30,
+ 'KEY_PREFIX': '2',
+ },
+ # For API throttles
+ 'throttles': {
+ 'BACKEND': 'django.core.cache.backends.db.DatabaseCache',
+ 'LOCATION': 'api_throttle_cache', # Table name
+ },
+}
--
GitLab