Skip to content

Commit e8b7908

Browse files
committed
Added memcached and django-debug-toolbar
1 parent d3a0be0 commit e8b7908

File tree

6 files changed

+217
-146
lines changed

6 files changed

+217
-146
lines changed

Pipfile

+3
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,9 @@ funcsigs = "==1.0.2"
3939
Django = "==1.11.16"
4040
Keras = "==2.2.4"
4141
ChemSpiPy = "==2.0.0"
42+
python-memcached = "==1.59"
43+
django-debug-toolbar = "==1.11"
44+
django-debug-toolbar-force = "==0.1.5"
4245

4346
[requires]
4447
python_version = "2.7"

Pipfile.lock

+179-141
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ms2ldaviz/motifdb/views.py

+2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
from django.middleware.csrf import get_token
77

88
from django.contrib.auth.decorators import login_required
9+
from django.views.decorators.cache import cache_page
10+
from django.conf import settings
911

1012
import json
1113
import numpy as np

ms2ldaviz/ms2ldaviz/settings.py

+19
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
'django.contrib.sessions',
4040
'django.contrib.messages',
4141
'django.contrib.staticfiles',
42+
'debug_toolbar',
4243
'basicviz',
4344
'annotation',
4445
'massbank',
@@ -52,6 +53,8 @@
5253
]
5354

5455
MIDDLEWARE_CLASSES = [
56+
'debug_toolbar.middleware.DebugToolbarMiddleware',
57+
'debug_toolbar_force.middleware.ForceDebugToolbarMiddleware',
5558
'django.middleware.security.SecurityMiddleware',
5659
'django.contrib.sessions.middleware.SessionMiddleware',
5760
'django.middleware.common.CommonMiddleware',
@@ -153,3 +156,19 @@
153156
# Chemspider token used on production server,
154157
# Replace it with own token (https://developer.rsc.org/) for your own server.
155158
CHEMSPIDER_APIKEY='b2VqZPJug1yDvbPgawGdGO59pdBw4eaf'
159+
160+
DEFAULT_CACHE_TIMEOUT = 60 * 60 * 24
161+
162+
# TODO: not sure if this will work with docker-compose?!
163+
CACHES = {
164+
'default': {
165+
'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache',
166+
'LOCATION': '127.0.0.1:11211',
167+
'TIMEOUT': DEFAULT_CACHE_TIMEOUT
168+
}
169+
}
170+
171+
# for django debug toolbar
172+
INTERNAL_IPS = [
173+
'127.0.0.1',
174+
]

ms2ldaviz/ms2ldaviz/urls.py

+11-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
from django.conf.urls import include, url
2-
from django.contrib import admin
3-
from django.conf.urls.static import static
41
from django.conf import settings
5-
import views
2+
from django.conf.urls import include, url # For django versions before 2.0
3+
from django.contrib import admin
64

5+
import views
76

87
urlpatterns = [
98
url(r'^$', views.home, name='home'),
@@ -23,4 +22,11 @@
2322
url(r'^decomposition/',include('decomposition.urls')),
2423
url(r'^ms1analysis/', include('ms1analysis.urls')),
2524
url(r'^motifdb/', include('motifdb.urls')),
26-
]
25+
]
26+
27+
# for django debug toolbar
28+
if settings.DEBUG:
29+
import debug_toolbar
30+
urlpatterns = [
31+
url(r'^__debug__/', include(debug_toolbar.urls)),
32+
] + urlpatterns

requirements.txt

+3
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,6 @@ tqdm==4.31.1
3131
chemspipy==2.0.0
3232
requests==2.21.0
3333
funcsigs==1.0.2
34+
python-memcached==1.59
35+
django-debug-toolbar==1.11
36+
django-debug-toolbar-force==0.1.5

0 commit comments

Comments
 (0)