Skip to content

Commit

Permalink
Merge branch 'main' into remove-bucket-endpoint-url
Browse files Browse the repository at this point in the history
  • Loading branch information
smarnach authored Jul 16, 2024
2 parents 9419610 + 1d02937 commit 777a60d
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 2 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ all-metrics-keys.json
coverage
coverage.xml
*.db
.devcontainer-build
dist/
.docker-build
docs/_build
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -60,12 +60,12 @@ run: .env .docker-build ## | Run the web app and services.
web frontend fakesentry

.PHONY: devcontainerbuild
devcontainerbuild: .env .docker-build .devcontainer-build ## | Build VS Code development container.
devcontainerbuild: .env .docker-build ## | Build VS Code development container.
${DC} build devcontainer
touch .devcontainer-build

.PHONY: devcontainer
devcontainer: .env .docker-build ## | Run VS Code development container.
devcontainer: .env .docker-build .devcontainer-build ## | Run VS Code development container.
${DC} up --detach devcontainer

.PHONY: stop
Expand Down
7 changes: 7 additions & 0 deletions tecken/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -394,6 +394,12 @@ def filter(self, record):
)

REDIS_URL = _config("REDIS_URL", doc="URL for Redis.")
REDIS_PASSWORD = (
_config(
"REDIS_PASSWORD", doc="Password for the Redis AUTH command.", raise_error=False
)
or None
)
REDIS_SOCKET_CONNECT_TIMEOUT = 2
REDIS_SOCKET_TIMEOUT = 2

Expand All @@ -417,6 +423,7 @@ def filter(self, record):
"BACKEND": "django_redis.cache.RedisCache",
"LOCATION": REDIS_URL,
"OPTIONS": {
"PASSWORD": REDIS_PASSWORD,
"COMPRESSOR": "django_redis.compressors.zlib.ZlibCompressor",
"SERIALIZER": "django_redis.serializers.msgpack.MSGPackSerializer",
"SOCKET_CONNECT_TIMEOUT": REDIS_SOCKET_CONNECT_TIMEOUT,
Expand Down

0 comments on commit 777a60d

Please sign in to comment.