Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,12 @@ services:
- .:/workspace
- app-assets:/assets

redis:
image: redis:8
command: ['redis-server', '--save', '10', '1', '--loglevel', 'warning']
volumes:
- redis:/data

replicator:
build:
context: .
Expand Down Expand Up @@ -169,3 +175,4 @@ volumes:
app-assets:
minio-data:
blobdb-data:
redis:
2 changes: 0 additions & 2 deletions docker/base.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,10 @@ RUN apt-get update --fix-missing && apt-get install -qy --no-install-recommends
libxtst6 \
libmagic-dev \
libmariadb-dev \
libmemcached-tools \
libyang2-tools \
locales \
make \
mariadb-client \
memcached \
nano \
netcat-traditional \
nodejs \
Expand Down
203 changes: 76 additions & 127 deletions ietf/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -1364,137 +1364,87 @@ def skip_unreadable_post(record):

if "CACHES" not in locals():
if SERVER_MODE == "production":
MEMCACHED_HOST = os.environ.get("MEMCACHED_SERVICE_HOST", "127.0.0.1")
MEMCACHED_PORT = os.environ.get("MEMCACHED_SERVICE_PORT", "11211")
CACHES = {
"default": {
"BACKEND": "ietf.utils.cache.LenientMemcacheCache",
"LOCATION": f"{MEMCACHED_HOST}:{MEMCACHED_PORT}",
"VERSION": __version__,
"KEY_PREFIX": "ietf:dt",
# Key function is default except with sha384-encoded key
"KEY_FUNCTION": lambda key, key_prefix, version: (
f"{key_prefix}:{version}:{sha384(str(key).encode('utf8')).hexdigest()}"
),
},
"agenda": {
"BACKEND": "ietf.utils.cache.LenientMemcacheCache",
"LOCATION": f"{MEMCACHED_HOST}:{MEMCACHED_PORT}",
# No release-specific VERSION setting.
"KEY_PREFIX": "ietf:dt:agenda",
# Key function is default except with sha384-encoded key
"KEY_FUNCTION": lambda key, key_prefix, version: (
f"{key_prefix}:{version}:{sha384(str(key).encode('utf8')).hexdigest()}"
),
},
"proceedings": {
"BACKEND": "ietf.utils.cache.LenientMemcacheCache",
"LOCATION": f"{MEMCACHED_HOST}:{MEMCACHED_PORT}",
# No release-specific VERSION setting.
"KEY_PREFIX": "ietf:dt:proceedings",
# Key function is default except with sha384-encoded key
"KEY_FUNCTION": lambda key, key_prefix, version: (
f"{key_prefix}:{version}:{sha384(str(key).encode('utf8')).hexdigest()}"
),
},
"sessions": {
"BACKEND": "ietf.utils.cache.LenientMemcacheCache",
"LOCATION": f"{MEMCACHED_HOST}:{MEMCACHED_PORT}",
# No release-specific VERSION setting.
"KEY_PREFIX": "ietf:dt",
},
"htmlized": {
"BACKEND": "django.core.cache.backends.filebased.FileBasedCache",
"LOCATION": "/a/cache/datatracker/htmlized",
"OPTIONS": {
"MAX_ENTRIES": 100000, # 100,000
},
},
"pdfized": {
"BACKEND": "django.core.cache.backends.filebased.FileBasedCache",
"LOCATION": "/a/cache/datatracker/pdfized",
"OPTIONS": {
"MAX_ENTRIES": 100000, # 100,000
},
},
"slowpages": {
"BACKEND": "django.core.cache.backends.filebased.FileBasedCache",
"LOCATION": "/a/cache/datatracker/slowpages",
"OPTIONS": {
"MAX_ENTRIES": 5000,
},
},
"celery-results": {
"BACKEND": "django.core.cache.backends.memcached.PyMemcacheCache",
"LOCATION": f"{MEMCACHED_HOST}:{MEMCACHED_PORT}",
"KEY_PREFIX": "ietf:celery",
},
}
else:
CACHES = {
"default": {
"BACKEND": "django.core.cache.backends.dummy.DummyCache",
#'BACKEND': 'ietf.utils.cache.LenientMemcacheCache',
#'LOCATION': '127.0.0.1:11211',
#'BACKEND': 'django.core.cache.backends.filebased.FileBasedCache',
"VERSION": __version__,
"KEY_PREFIX": "ietf:dt",
},
"agenda": {
"BACKEND": "django.core.cache.backends.dummy.DummyCache",
# "BACKEND": "ietf.utils.cache.LenientMemcacheCache",
# "LOCATION": "127.0.0.1:11211",
# No release-specific VERSION setting.
"KEY_PREFIX": "ietf:dt:agenda",
# Key function is default except with sha384-encoded key
"KEY_FUNCTION": lambda key, key_prefix, version: (
f"{key_prefix}:{version}:{sha384(str(key).encode('utf8')).hexdigest()}"
),
},
"proceedings": {
"BACKEND": "django.core.cache.backends.dummy.DummyCache",
# "BACKEND": "ietf.utils.cache.LenientMemcacheCache",
# "LOCATION": "127.0.0.1:11211",
# No release-specific VERSION setting.
"KEY_PREFIX": "ietf:dt:proceedings",
# Key function is default except with sha384-encoded key
"KEY_FUNCTION": lambda key, key_prefix, version: (
f"{key_prefix}:{version}:{sha384(str(key).encode('utf8')).hexdigest()}"
),
},
"sessions": {
"BACKEND": "django.core.cache.backends.locmem.LocMemCache",
raise RuntimeError("Must set CACHES in settings_local for production mode")
CACHES = {
"default": {
"BACKEND": "django.core.cache.backends.dummy.DummyCache",
# "BACKEND": "django_redis.cache.RedisCache",
# "LOCATION": "redis://redis:6379/0",
# "OPTIONS": {
# "CLIENT_CLASS": "django_redis.client.DefaultClient",
# },
# "BACKEND": "django.core.cache.backends.filebased.FileBasedCache",
"VERSION": __version__,
"KEY_PREFIX": "ietf:dt",
},
"agenda": {
"BACKEND": "django.core.cache.backends.dummy.DummyCache",
# "BACKEND": "django_redis.cache.RedisCache",
# "LOCATION": "redis://redis:6379/0",
# "OPTIONS": {
# "CLIENT_CLASS": "django_redis.client.DefaultClient",
# },
# No release-specific VERSION setting.
"KEY_PREFIX": "ietf:dt:agenda",
# Key function is default except with sha384-encoded key
"KEY_FUNCTION": lambda key, key_prefix, version: (
f"{key_prefix}:{version}:{sha384(str(key).encode('utf8')).hexdigest()}"
),
},
"proceedings": {
"BACKEND": "django.core.cache.backends.dummy.DummyCache",
# "BACKEND": "django_redis.cache.RedisCache",
# "LOCATION": "redis://redis:6379/0",
# "OPTIONS": {
# "CLIENT_CLASS": "django_redis.client.DefaultClient",
# },
# No release-specific VERSION setting.
"KEY_PREFIX": "ietf:dt:proceedings",
# Key function is default except with sha384-encoded key
"KEY_FUNCTION": lambda key, key_prefix, version: (
f"{key_prefix}:{version}:{sha384(str(key).encode('utf8')).hexdigest()}"
),
},
"sessions": {
"BACKEND": "django_redis.cache.RedisCache",
"LOCATION": "redis://redis:6379/0",
"OPTIONS": {
"CLIENT_CLASS": "django_redis.client.DefaultClient",
},
"htmlized": {
"BACKEND": "django.core.cache.backends.dummy.DummyCache",
#'BACKEND': 'django.core.cache.backends.filebased.FileBasedCache',
"LOCATION": "/var/cache/datatracker/htmlized",
"OPTIONS": {
"MAX_ENTRIES": 1000,
},
},
"htmlized": {
"BACKEND": "django.core.cache.backends.dummy.DummyCache",
#'BACKEND': 'django.core.cache.backends.filebased.FileBasedCache',
"LOCATION": "/var/cache/datatracker/htmlized",
"OPTIONS": {
"MAX_ENTRIES": 1000,
},
"pdfized": {
"BACKEND": "django.core.cache.backends.dummy.DummyCache",
#'BACKEND': 'django.core.cache.backends.filebased.FileBasedCache',
"LOCATION": "/var/cache/datatracker/pdfized",
"OPTIONS": {
"MAX_ENTRIES": 1000,
},
},
"pdfized": {
"BACKEND": "django.core.cache.backends.dummy.DummyCache",
#'BACKEND': 'django.core.cache.backends.filebased.FileBasedCache',
"LOCATION": "/var/cache/datatracker/pdfized",
"OPTIONS": {
"MAX_ENTRIES": 1000,
},
"slowpages": {
"BACKEND": "django.core.cache.backends.dummy.DummyCache",
#'BACKEND': 'django.core.cache.backends.filebased.FileBasedCache',
"LOCATION": "/var/cache/datatracker/",
"OPTIONS": {
"MAX_ENTRIES": 5000,
},
},
"slowpages": {
"BACKEND": "django.core.cache.backends.dummy.DummyCache",
#'BACKEND': 'django.core.cache.backends.filebased.FileBasedCache',
"LOCATION": "/var/cache/datatracker/",
"OPTIONS": {
"MAX_ENTRIES": 5000,
},
"celery-results": {
"BACKEND": "django.core.cache.backends.memcached.PyMemcacheCache",
"LOCATION": "app:11211",
"KEY_PREFIX": "ietf:celery",
},
"celery-results": {
"BACKEND": "django_redis.cache.RedisCache",
"LOCATION": "redis://redis:6379/0",
"OPTIONS": {
"CLIENT_CLASS": "django_redis.client.DefaultClient",
},
}
"KEY_PREFIX": "ietf:celery",
},
}

PUBLISH_IPR_STATES = ['posted', 'removed', 'removed_objfalse']

Expand All @@ -1509,7 +1459,6 @@ def skip_unreadable_post(record):
loaders = TEMPLATES[0]['OPTIONS']['loaders']
loaders = tuple(l for e in loaders for l in (e[1] if isinstance(e, tuple) and "cached.Loader" in e[0] else (e,)))
TEMPLATES[0]['OPTIONS']['loaders'] = loaders
SESSION_ENGINE = "django.contrib.sessions.backends.db"

if 'SECRET_KEY' not in locals():
SECRET_KEY = 'PDwXboUq!=hPjnrtG2=ge#N$Dwy+wn@uivrugwpic8mxyPfHka'
Expand Down
1 change: 0 additions & 1 deletion k8s/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,5 @@ resources:
- beat.yaml
- celery.yaml
- datatracker.yaml
- memcached.yaml
- rabbitmq.yaml
- replicator.yaml
88 changes: 0 additions & 88 deletions k8s/memcached.yaml

This file was deleted.

Loading
Loading