From 9437cf8b027e6ef7ae60f6004df14744c5f501d1 Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Wed, 5 Dec 2018 15:11:24 +0000 Subject: [PATCH] explicity split redis config values --- .../config/settings.defaults.coffee | 24 +++++++++---------- services/document-updater/package.json | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/services/document-updater/config/settings.defaults.coffee b/services/document-updater/config/settings.defaults.coffee index bad2d1429d..e23510afda 100755 --- a/services/document-updater/config/settings.defaults.coffee +++ b/services/document-updater/config/settings.defaults.coffee @@ -21,9 +21,9 @@ module.exports = redis: realtime: - port: process.env["REDIS_PORT"] or "6379" - host: process.env["REDIS_HOST"] or "localhost" - password: process.env["REDIS_PASSWORD"] + port: process.env["REAL_TIME_REDIS_PORT"] or process.env["REDIS_PORT"] or "6379" + host: process.env["REAL_TIME_REDIS_HOST"] or process.env["REDIS_HOST"] or "localhost" + password: process.env["REAL_TIME_REDIS_PASSWORD"] or process.env["REDIS_PASSWORD"] or "" key_schema: pendingUpdates: ({doc_id}) -> "PendingUpdates:#{doc_id}" # cluster: [{ @@ -33,9 +33,9 @@ module.exports = # key_schema: # pendingUpdates: ({doc_id}) -> "PendingUpdates:{#{doc_id}}" documentupdater: - port: process.env["REDIS_PORT"] or "6379" - host: process.env["REDIS_HOST"] or "localhost" - password: process.env["REDIS_PASSWORD"] + port: process.env["DOC_UPDATER_REDIS_PORT"] or process.env["REDIS_PORT"] or "6379" + host: process.env["DOC_UPDATER_REDIS_HOST"] or process.env["REDIS_HOST"] or "localhost" + password: process.env["DOC_UPDATER_REDIS_PASSWORD"] or process.env["REDIS_PASSWORD"] or "" key_schema: blockingKey: ({doc_id}) -> "Blocking:#{doc_id}" docLines: ({doc_id}) -> "doclines:#{doc_id}" @@ -64,9 +64,9 @@ module.exports = # ranges: ({doc_id}) -> "Ranges:{#{doc_id}}" # projectState: ({project_id}) -> "ProjectState:{#{project_id}}" history: - port: process.env["REDIS_PORT"] or "6379" - host: process.env["REDIS_HOST"] or "localhost" - password: process.env["REDIS_PASSWORD"] + port: process.env["HISTORY_REDIS_PORT"] or process.env["REDIS_PORT"] or "6379" + host: process.env["HISTORY_REDIS_HOST"] or process.env["REDIS_HOST"] or "localhost" + password: process.env["HISTORY_REDIS_PASSWORD"] or process.env["REDIS_PASSWORD"] or "" key_schema: uncompressedHistoryOps: ({doc_id}) -> "UncompressedHistoryOps:#{doc_id}" docsWithHistoryOps: ({project_id}) -> "DocsWithHistoryOps:#{project_id}" @@ -83,9 +83,9 @@ module.exports = # uncompressedHistoryOps: ({doc_id}) -> "UncompressedHistoryOps:{#{doc_id}}" # docsWithHistoryOps: ({project_id}) -> "DocsWithHistoryOps:{#{project_id}}" lock: - port: process.env["REDIS_PORT"] or "6379" - host: process.env["REDIS_HOST"] or "localhost" - password: process.env["REDIS_PASSWORD"] + port: process.env["LOCK_REDIS_PORT"] or process.env["REDIS_PORT"] or "6379" + host: process.env["LOCK_REDIS_HOST"] or process.env["REDIS_HOST"] or "localhost" + password: process.env["LOCK_REDIS_PASSWORD"] or process.env["REDIS_PASSWORD"] or "" key_schema: blockingKey: ({doc_id}) -> "Blocking:#{doc_id}" # cluster: [{ diff --git a/services/document-updater/package.json b/services/document-updater/package.json index ec17378d85..006509bec7 100644 --- a/services/document-updater/package.json +++ b/services/document-updater/package.json @@ -25,7 +25,7 @@ "express": "3.3.4", "logger-sharelatex": "git+https://github.com/sharelatex/logger-sharelatex.git#v1.5.6", "lynx": "0.0.11", - "metrics-sharelatex": "git+https://github.com/sharelatex/metrics-sharelatex.git#v2.0.7", + "metrics-sharelatex": "git+https://github.com/sharelatex/metrics-sharelatex.git#v2.0.8", "redis-sharelatex": "git+https://github.com/sharelatex/redis-sharelatex.git#v1.0.4", "request": "2.25.0", "requestretry": "^1.12.0",