From c8ea2ab199bfd6d1836078fa26d578400a8099db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karol=20S=C3=B3jko?= Date: Thu, 4 May 2023 12:11:19 +0200 Subject: [PATCH] fix: add env vars to control cache type for home server --- docker/docker-entrypoint.sh | 3 +++ packages/api-gateway/.env.sample | 1 + packages/api-gateway/src/Bootstrap/Container.ts | 2 +- packages/files/.env.sample | 1 + packages/files/src/Bootstrap/Container.ts | 2 +- 5 files changed, 7 insertions(+), 2 deletions(-) diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh index 11919cbcd..42fa1e642 100755 --- a/docker/docker-entrypoint.sh +++ b/docker/docker-entrypoint.sh @@ -60,6 +60,9 @@ fi if [ -z "$DB_TYPE" ]; then export DB_TYPE="mysql" fi +if [ -z "$CACHE_TYPE" ]; then + export CACHE_TYPE="redis" +fi export DB_MIGRATIONS_PATH="dist/migrations/*.js" ######### diff --git a/packages/api-gateway/.env.sample b/packages/api-gateway/.env.sample index ca02ce5bc..6d72ccb83 100644 --- a/packages/api-gateway/.env.sample +++ b/packages/api-gateway/.env.sample @@ -25,6 +25,7 @@ NEW_RELIC_DISTRIBUTED_TRACING_ENABLED=false NEW_RELIC_LOG_ENABLED=false NEW_RELIC_LOG_LEVEL=info +CACHE_TYPE=redis REDIS_URL=redis://cache # (Optional) Caching Cross Service Tokens diff --git a/packages/api-gateway/src/Bootstrap/Container.ts b/packages/api-gateway/src/Bootstrap/Container.ts index e6113ac47..757b5db97 100644 --- a/packages/api-gateway/src/Bootstrap/Container.ts +++ b/packages/api-gateway/src/Bootstrap/Container.ts @@ -27,7 +27,7 @@ export class ContainerConfigLoader { const container = new Container() - const isConfiguredForHomeServer = env.get('DB_TYPE') === 'sqlite' + const isConfiguredForHomeServer = env.get('CACHE_TYPE') === 'memory' const newrelicWinstonFormatter = newrelicFormatter(winston) const winstonFormatters = [winston.format.splat(), winston.format.json()] diff --git a/packages/files/.env.sample b/packages/files/.env.sample index 2f22aed27..5da6355a0 100644 --- a/packages/files/.env.sample +++ b/packages/files/.env.sample @@ -4,6 +4,7 @@ VERSION=development PORT=3000 +CACHE_TYPE=redis REDIS_URL=redis://cache VALET_TOKEN_SECRET=change-me-! diff --git a/packages/files/src/Bootstrap/Container.ts b/packages/files/src/Bootstrap/Container.ts index 9f6637554..25c5dd1db 100644 --- a/packages/files/src/Bootstrap/Container.ts +++ b/packages/files/src/Bootstrap/Container.ts @@ -52,7 +52,7 @@ export class ContainerConfigLoader { const container = new Container() - const isConfiguredForHomeServer = env.get('DB_TYPE') === 'sqlite' + const isConfiguredForHomeServer = env.get('CACHE_TYPE') === 'memory' const logger = this.createLogger({ env }) container.bind(TYPES.Logger).toConstantValue(logger)