From e7e4e49d906ae45dc61439803fcbd16ad0885cec Mon Sep 17 00:00:00 2001 From: Brian Gough Date: Thu, 23 Jun 2022 09:08:33 +0100 Subject: [PATCH] Merge pull request #8546 from overleaf/bg-fix-docupdater-history-redis [document-updater] docsWithHistoryOps should use the main rclient GitOrigin-RevId: a86c081ea0b0f02a9d4c36df0ca76dc9aa3bac57 --- services/document-updater/app/js/HistoryRedisManager.js | 4 +--- .../unit/js/HistoryRedisManager/HistoryRedisManagerTests.js | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/services/document-updater/app/js/HistoryRedisManager.js b/services/document-updater/app/js/HistoryRedisManager.js index 1a6bc25d3f..4756201471 100644 --- a/services/document-updater/app/js/HistoryRedisManager.js +++ b/services/document-updater/app/js/HistoryRedisManager.js @@ -12,9 +12,7 @@ */ let HistoryRedisManager const Settings = require('@overleaf/settings') -const rclient = require('@overleaf/redis-wrapper').createClient( - Settings.redis.history -) +const { rclient } = require('./RedisManager') // docsWithHistoryOps lives in main redis const Keys = Settings.redis.history.key_schema const logger = require('@overleaf/logger') diff --git a/services/document-updater/test/unit/js/HistoryRedisManager/HistoryRedisManagerTests.js b/services/document-updater/test/unit/js/HistoryRedisManager/HistoryRedisManagerTests.js index 942884ec58..009fdf50c3 100644 --- a/services/document-updater/test/unit/js/HistoryRedisManager/HistoryRedisManagerTests.js +++ b/services/document-updater/test/unit/js/HistoryRedisManager/HistoryRedisManagerTests.js @@ -25,7 +25,7 @@ describe('HistoryRedisManager', function () { this.rclient.multi = () => this.rclient this.HistoryRedisManager = SandboxedModule.require(modulePath, { requires: { - '@overleaf/redis-wrapper': { createClient: () => this.rclient }, + './RedisManager': { rclient: this.rclient }, '@overleaf/settings': { redis: { history: (this.settings = {