diff --git a/config/settings/container/base.py b/config/settings/container/base.py index 6bd9dcbd30ba9b7ae4dedd6ceba3d0726b581f68..8f643d8a240926e5cd87e5dea6cc35509303abca 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 df67e67bce60690a64ba73b4fd487aa68144d444..79154c6fce1cbe6d862c4e9853fca2f63c63c098 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 707af09282bcf18db2a1adb29c688ac381d24edc..3f2714036d8b39c2c51e48c30f69c870f9bffdd1 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 16fdfa04e7f1015d8e34e60a8c120c7c1ffb552f..1e1b50e060078a4961d0542088fc0ebf7ca41502 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 c2d62fbbf742737fbc0a7e586003e1f281b11501..f2731b0b25130065f8887dd51b220e7431294b68 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 + }, +}