diff --git a/services/document-updater/app/coffee/DispatchManager.coffee b/services/document-updater/app/coffee/DispatchManager.coffee index e751534068..93a22bfc07 100644 --- a/services/document-updater/app/coffee/DispatchManager.coffee +++ b/services/document-updater/app/coffee/DispatchManager.coffee @@ -10,7 +10,7 @@ RateLimitManager = require('./RateLimitManager') module.exports = DispatchManager = createDispatcher: (RateLimiter) -> - client = redis.createClient(Settings.redis.documentupdater) + client = redis.createClient(Settings.redis.realtime) worker = { client: client _waitForUpdateThenDispatchWorker: (callback = (error) ->) -> diff --git a/services/document-updater/app/coffee/RealTimeRedisManager.coffee b/services/document-updater/app/coffee/RealTimeRedisManager.coffee index 64bbe572b8..7da7ca1f64 100644 --- a/services/document-updater/app/coffee/RealTimeRedisManager.coffee +++ b/services/document-updater/app/coffee/RealTimeRedisManager.coffee @@ -1,6 +1,6 @@ Settings = require('settings-sharelatex') -rclient = require("redis-sharelatex").createClient(Settings.redis.documentupdater) -Keys = Settings.redis.documentupdater.key_schema +rclient = require("redis-sharelatex").createClient(Settings.redis.realtime) +Keys = Settings.redis.realtime.key_schema logger = require('logger-sharelatex') MAX_OPS_PER_ITERATION = 8 # process a limited number of ops for safety diff --git a/services/document-updater/config/settings.defaults.coffee b/services/document-updater/config/settings.defaults.coffee index 9ae402bc4e..2fbe80915f 100755 --- a/services/document-updater/config/settings.defaults.coffee +++ b/services/document-updater/config/settings.defaults.coffee @@ -21,6 +21,15 @@ module.exports = redis: + realtime: + 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 "" + redisOptions: + keepAlive: 100 + key_schema: + pendingUpdates: ({doc_id}) -> "PendingUpdates:#{doc_id}" + history: 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" diff --git a/services/document-updater/test/acceptance/coffee/helpers/DocUpdaterClient.coffee b/services/document-updater/test/acceptance/coffee/helpers/DocUpdaterClient.coffee index 587e6f3af9..7f50d64372 100644 --- a/services/document-updater/test/acceptance/coffee/helpers/DocUpdaterClient.coffee +++ b/services/document-updater/test/acceptance/coffee/helpers/DocUpdaterClient.coffee @@ -1,10 +1,10 @@ Settings = require('settings-sharelatex') -rclient = require("redis-sharelatex").createClient(Settings.redis.documentupdater) -keys = Settings.redis.documentupdater.key_schema +rclient = require("redis-sharelatex").createClient(Settings.redis.realtime) +keys = Settings.redis.realtime.key_schema request = require("request").defaults(jar: false) async = require "async" -rclient_sub = require("redis-sharelatex").createClient(Settings.redis.documentupdater) +rclient_sub = require("redis-sharelatex").createClient(Settings.redis.realtime) rclient_sub.subscribe "applied-ops" rclient_sub.setMaxListeners(0) diff --git a/services/document-updater/test/unit/coffee/DispatchManager/DispatchManagerTests.coffee b/services/document-updater/test/unit/coffee/DispatchManager/DispatchManagerTests.coffee index 85cdcb5a7e..990688ce86 100644 --- a/services/document-updater/test/unit/coffee/DispatchManager/DispatchManagerTests.coffee +++ b/services/document-updater/test/unit/coffee/DispatchManager/DispatchManagerTests.coffee @@ -13,7 +13,7 @@ describe "DispatchManager", -> "logger-sharelatex": @logger = { log: sinon.stub() } "settings-sharelatex": @settings = redis: - documentupdater: {} + realtime: {} "redis-sharelatex": @redis = {} "./RateLimitManager": {} "./Metrics": diff --git a/services/document-updater/test/unit/coffee/RealTimeRedisManager/RealTimeRedisManagerTests.coffee b/services/document-updater/test/unit/coffee/RealTimeRedisManager/RealTimeRedisManagerTests.coffee index 375b85df78..a04da996dc 100644 --- a/services/document-updater/test/unit/coffee/RealTimeRedisManager/RealTimeRedisManagerTests.coffee +++ b/services/document-updater/test/unit/coffee/RealTimeRedisManager/RealTimeRedisManagerTests.coffee @@ -15,7 +15,7 @@ describe "RealTimeRedisManager", -> "redis-sharelatex": createClient: () => @rclient "settings-sharelatex": redis: - documentupdater: @settings = + realtime: @settings = key_schema: pendingUpdates: ({doc_id}) -> "PendingUpdates:#{doc_id}" "logger-sharelatex": { log: () -> }