From b8f928f5f9cfc80f9751fab0349a749969126243 Mon Sep 17 00:00:00 2001
From: "alexander.pace@ligo.org" <alexander.pace@ligo.org>
Date: Fri, 17 Jan 2020 10:53:36 -0600
Subject: [PATCH] Minor css update, major cache update
Turning on AWS Elasticache. NOTE: this is only available on DEV
https://git.ligo.org/lscsoft/gracedb/issues/189
---
config/settings/container/base.py | 27 +++++++++++++++++++++++++++
gracedb/static/css/override.css | 8 --------
requirements.txt | 2 ++
3 files changed, 29 insertions(+), 8 deletions(-)
diff --git a/config/settings/container/base.py b/config/settings/container/base.py
index b2f50699c..5f2abd668 100644
--- a/config/settings/container/base.py
+++ b/config/settings/container/base.py
@@ -84,6 +84,32 @@ 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_elasticache.memcached.ElastiCache',
+ 'LOCATION': AWS_ELASTICACHE_ADDR,
+ 'OPTIONS' {
+ 'IGNORE_CLUSTER_ERRORS': [True,False],
+ },
+ }
+MIDDLEWARE = [
+ 'core.middleware.maintenance.MaintenanceModeMiddleware',
+ 'events.middleware.PerformanceMiddleware',
+ 'core.middleware.accept.AcceptMiddleware',
+ 'core.middleware.api.ClientVersionMiddleware',
+ 'core.middleware.api.CliExceptionMiddleware',
+ 'django.middleware.cache.UpdateCacheMiddleware',
+ 'django.middleware.common.CommonMiddleware',
+ 'django.middleware.cache.FetchFromCacheMiddleware',
+ 'core.middleware.proxy.XForwardedForMiddleware',
+ 'user_sessions.middleware.SessionMiddleware',
+ 'django.contrib.messages.middleware.MessageMiddleware',
+ 'django.contrib.auth.middleware.AuthenticationMiddleware',
+ 'ligoauth.middleware.ShibbolethWebAuthMiddleware',
+ 'ligoauth.middleware.ControlRoomMiddleware',
+]
+
# Priority server settings ----------------------------------------------------
@@ -113,6 +139,7 @@ DATABASES = {
'PORT': os.environ.get('DJANGO_DB_PORT', ''),
'OPTIONS': {
'init_command': 'SET storage_engine=MyISAM',
+ 'CONN_MAX_AGE': 3600,
# NOTE: for mysql>=5.7 this will need to be changed to
#'init_command': 'SET default_storage_engine=MyISAM',
},
diff --git a/gracedb/static/css/override.css b/gracedb/static/css/override.css
index 643b5f23b..96bfcbf93 100644
--- a/gracedb/static/css/override.css
+++ b/gracedb/static/css/override.css
@@ -11,11 +11,3 @@
border-color: #FFFFFF;
}
-ul {
- list-style-position: outside;
-}
-
-li {
-list-style-position: inside;
-text-indent: -1em;
-}
diff --git a/requirements.txt b/requirements.txt
index 3488f34d9..05813f6eb 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -32,6 +32,8 @@ packaging==17.1
phonenumbers==8.8.11
python-ldap==3.1.0
python-memcached==1.59
+# Install django-elasticache along with python memcached:
+git+git://github.com/gusdan/django-elasticache.git#egg=django-elasticache
scipy==1.2.1
sentry-sdk==0.7.10
service_identity==17.0.0
--
GitLab