Skip to content

Commit ddf229c

Browse files
rjsparksrjsparks
authored
ci: merge main to release
2 parents 5955154 + 4bffde1 commit ddf229c

1 file changed

Lines changed: 78 additions & 79 deletions

File tree

‎ietf/settings.py‎

Lines changed: 78 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -726,47 +726,6 @@ def skip_unreadable_post(record):
726726
CACHE_MIDDLEWARE_SECONDS = 300
727727
CACHE_MIDDLEWARE_KEY_PREFIX = ''
728728

729-
# The default with no CACHES setting is 'django.core.cache.backends.locmem.LocMemCache'
730-
# This setting is possibly overridden further down, after the import of settings_local
731-
CACHES = {
732-
'default': {
733-
'BACKEND': 'ietf.utils.cache.LenientMemcacheCache',
734-
'LOCATION': '127.0.0.1:11211',
735-
'VERSION': __version__,
736-
'KEY_PREFIX': 'ietf:dt',
737-
'KEY_FUNCTION': lambda key, key_prefix, version: (
738-
f"{key_prefix}:{version}:{sha384(key.encode('utf8')).hexdigest()}"
739-
),
740-
},
741-
'sessions': {
742-
'BACKEND': 'ietf.utils.cache.LenientMemcacheCache',
743-
'LOCATION': '127.0.0.1:11211',
744-
# No release-specific VERSION setting.
745-
'KEY_PREFIX': 'ietf:dt',
746-
},
747-
'htmlized': {
748-
'BACKEND': 'django.core.cache.backends.filebased.FileBasedCache',
749-
'LOCATION': '/a/cache/datatracker/htmlized',
750-
'OPTIONS': {
751-
'MAX_ENTRIES': 100000, # 100,000
752-
},
753-
},
754-
'pdfized': {
755-
'BACKEND': 'django.core.cache.backends.filebased.FileBasedCache',
756-
'LOCATION': '/a/cache/datatracker/pdfized',
757-
'OPTIONS': {
758-
'MAX_ENTRIES': 100000, # 100,000
759-
},
760-
},
761-
'slowpages': {
762-
'BACKEND': 'django.core.cache.backends.filebased.FileBasedCache',
763-
'LOCATION': '/a/cache/datatracker/slowpages',
764-
'OPTIONS': {
765-
'MAX_ENTRIES': 5000,
766-
},
767-
},
768-
}
769-
770729
HTMLIZER_VERSION = 1
771730
HTMLIZER_URL_PREFIX = "/doc/html"
772731
HTMLIZER_CACHE_TIME = 60*60*24*14 # 14 days
@@ -1232,6 +1191,84 @@ def skip_unreadable_post(record):
12321191
MIDDLEWARE += DEV_MIDDLEWARE
12331192
TEMPLATES[0]['OPTIONS']['context_processors'] += DEV_TEMPLATE_CONTEXT_PROCESSORS
12341193

1194+
if 'CACHES' not in locals():
1195+
if SERVER_MODE == 'production':
1196+
CACHES = {
1197+
'default': {
1198+
'BACKEND': 'ietf.utils.cache.LenientMemcacheCache',
1199+
'LOCATION': '127.0.0.1:11211',
1200+
'VERSION': __version__,
1201+
'KEY_PREFIX': 'ietf:dt',
1202+
'KEY_FUNCTION': lambda key, key_prefix, version: (
1203+
f"{key_prefix}:{version}:{sha384(str(key).encode('utf8')).hexdigest()}"
1204+
),
1205+
},
1206+
'sessions': {
1207+
'BACKEND': 'ietf.utils.cache.LenientMemcacheCache',
1208+
'LOCATION': '127.0.0.1:11211',
1209+
# No release-specific VERSION setting.
1210+
'KEY_PREFIX': 'ietf:dt',
1211+
},
1212+
'htmlized': {
1213+
'BACKEND': 'django.core.cache.backends.filebased.FileBasedCache',
1214+
'LOCATION': '/a/cache/datatracker/htmlized',
1215+
'OPTIONS': {
1216+
'MAX_ENTRIES': 100000, # 100,000
1217+
},
1218+
},
1219+
'pdfized': {
1220+
'BACKEND': 'django.core.cache.backends.filebased.FileBasedCache',
1221+
'LOCATION': '/a/cache/datatracker/pdfized',
1222+
'OPTIONS': {
1223+
'MAX_ENTRIES': 100000, # 100,000
1224+
},
1225+
},
1226+
'slowpages': {
1227+
'BACKEND': 'django.core.cache.backends.filebased.FileBasedCache',
1228+
'LOCATION': '/a/cache/datatracker/slowpages',
1229+
'OPTIONS': {
1230+
'MAX_ENTRIES': 5000,
1231+
},
1232+
},
1233+
}
1234+
else:
1235+
CACHES = {
1236+
'default': {
1237+
'BACKEND': 'django.core.cache.backends.dummy.DummyCache',
1238+
#'BACKEND': 'ietf.utils.cache.LenientMemcacheCache',
1239+
#'LOCATION': '127.0.0.1:11211',
1240+
#'BACKEND': 'django.core.cache.backends.filebased.FileBasedCache',
1241+
'VERSION': __version__,
1242+
'KEY_PREFIX': 'ietf:dt',
1243+
},
1244+
'sessions': {
1245+
'BACKEND': 'django.core.cache.backends.locmem.LocMemCache',
1246+
},
1247+
'htmlized': {
1248+
'BACKEND': 'django.core.cache.backends.dummy.DummyCache',
1249+
#'BACKEND': 'django.core.cache.backends.filebased.FileBasedCache',
1250+
'LOCATION': '/var/cache/datatracker/htmlized',
1251+
'OPTIONS': {
1252+
'MAX_ENTRIES': 1000,
1253+
},
1254+
},
1255+
'pdfized': {
1256+
'BACKEND': 'django.core.cache.backends.dummy.DummyCache',
1257+
#'BACKEND': 'django.core.cache.backends.filebased.FileBasedCache',
1258+
'LOCATION': '/var/cache/datatracker/pdfized',
1259+
'OPTIONS': {
1260+
'MAX_ENTRIES': 1000,
1261+
},
1262+
},
1263+
'slowpages': {
1264+
'BACKEND': 'django.core.cache.backends.dummy.DummyCache',
1265+
#'BACKEND': 'django.core.cache.backends.filebased.FileBasedCache',
1266+
'LOCATION': '/var/cache/datatracker/',
1267+
'OPTIONS': {
1268+
'MAX_ENTRIES': 5000,
1269+
},
1270+
},
1271+
}
12351272

12361273
# We provide a secret key only for test and development modes. It's
12371274
# absolutely vital that django fails to start in production mode unless a
@@ -1242,44 +1279,6 @@ def skip_unreadable_post(record):
12421279
loaders = TEMPLATES[0]['OPTIONS']['loaders']
12431280
loaders = tuple(l for e in loaders for l in (e[1] if isinstance(e, tuple) and "cached.Loader" in e[0] else (e,)))
12441281
TEMPLATES[0]['OPTIONS']['loaders'] = loaders
1245-
1246-
CACHES = {
1247-
'default': {
1248-
'BACKEND': 'django.core.cache.backends.dummy.DummyCache',
1249-
#'BACKEND': 'ietf.utils.cache.LenientMemcacheCache',
1250-
#'LOCATION': '127.0.0.1:11211',
1251-
#'BACKEND': 'django.core.cache.backends.filebased.FileBasedCache',
1252-
'VERSION': __version__,
1253-
'KEY_PREFIX': 'ietf:dt',
1254-
},
1255-
'sessions': {
1256-
'BACKEND': 'django.core.cache.backends.locmem.LocMemCache',
1257-
},
1258-
'htmlized': {
1259-
'BACKEND': 'django.core.cache.backends.dummy.DummyCache',
1260-
#'BACKEND': 'django.core.cache.backends.filebased.FileBasedCache',
1261-
'LOCATION': '/var/cache/datatracker/htmlized',
1262-
'OPTIONS': {
1263-
'MAX_ENTRIES': 1000,
1264-
},
1265-
},
1266-
'pdfized': {
1267-
'BACKEND': 'django.core.cache.backends.dummy.DummyCache',
1268-
#'BACKEND': 'django.core.cache.backends.filebased.FileBasedCache',
1269-
'LOCATION': '/var/cache/datatracker/pdfized',
1270-
'OPTIONS': {
1271-
'MAX_ENTRIES': 1000,
1272-
},
1273-
},
1274-
'slowpages': {
1275-
'BACKEND': 'django.core.cache.backends.dummy.DummyCache',
1276-
#'BACKEND': 'django.core.cache.backends.filebased.FileBasedCache',
1277-
'LOCATION': '/var/cache/datatracker/',
1278-
'OPTIONS': {
1279-
'MAX_ENTRIES': 5000,
1280-
},
1281-
},
1282-
}
12831282
SESSION_ENGINE = "django.contrib.sessions.backends.db"
12841283

12851284
if 'SECRET_KEY' not in locals():

0 commit comments

Comments
 (0)