diff --git a/services/document-updater/app.coffee b/services/document-updater/app.coffee index e246d366e8..6ef7f478f1 100644 --- a/services/document-updater/app.coffee +++ b/services/document-updater/app.coffee @@ -7,13 +7,12 @@ RedisManager = require('./app/js/RedisManager') UpdateManager = require('./app/js/UpdateManager') DispatchManager = require('./app/js/DispatchManager') Keys = require('./app/js/RedisKeyBuilder') -redis = require('redis') Errors = require "./app/js/Errors" HttpController = require "./app/js/HttpController" -redisConf = Settings.redis.web -rclient = redis.createClient(redisConf.port, redisConf.host) -rclient.auth(redisConf.password) +redis = require("redis-sharelatex") +rclient = redis.createClient(Settings.redis.web) + Path = require "path" Metrics = require "metrics-sharelatex" diff --git a/services/document-updater/app/coffee/DispatchManager.coffee b/services/document-updater/app/coffee/DispatchManager.coffee index afb1a5d176..4216a6dbcf 100644 --- a/services/document-updater/app/coffee/DispatchManager.coffee +++ b/services/document-updater/app/coffee/DispatchManager.coffee @@ -1,16 +1,14 @@ Settings = require('settings-sharelatex') logger = require('logger-sharelatex') Keys = require('./RedisKeyBuilder') -redis = require('redis') +redis = require("redis-sharelatex") + UpdateManager = require('./UpdateManager') Metrics = require('./Metrics') module.exports = DispatchManager = createDispatcher: () -> - redisConf = Settings.redis.web - client = redis.createClient(redisConf.port, redisConf.host) - client.auth(redisConf.password) - + client = redis.createClient(Settings.redis.web) worker = { client: client _waitForUpdateThenDispatchWorker: (callback = (error) ->) -> diff --git a/services/document-updater/app/coffee/LockManager.coffee b/services/document-updater/app/coffee/LockManager.coffee index a43bd84a1b..0facb8519b 100644 --- a/services/document-updater/app/coffee/LockManager.coffee +++ b/services/document-updater/app/coffee/LockManager.coffee @@ -1,9 +1,7 @@ metrics = require('./Metrics') Settings = require('settings-sharelatex') -redis = require('redis') -redisConf = Settings.redis.web -rclient = redis.createClient(redisConf.port, redisConf.host) -rclient.auth(redisConf.password) +redis = require("redis-sharelatex") +rclient = redis.createClient(Settings.redis.web) keys = require('./RedisKeyBuilder') logger = require "logger-sharelatex" diff --git a/services/document-updater/app/coffee/RedisManager.coffee b/services/document-updater/app/coffee/RedisManager.coffee index 9f3ad1bca2..6a920b42c4 100644 --- a/services/document-updater/app/coffee/RedisManager.coffee +++ b/services/document-updater/app/coffee/RedisManager.coffee @@ -1,8 +1,6 @@ Settings = require('settings-sharelatex') -redis = require('redis') -redisConf = Settings.redis.web -rclient = redis.createClient(redisConf.port, redisConf.host) -rclient.auth(redisConf.password) +redis = require("redis-sharelatex") +rclient = redis.createClient(Settings.redis.web) async = require('async') _ = require('underscore') keys = require('./RedisKeyBuilder') diff --git a/services/document-updater/app/coffee/ShareJsUpdateManager.coffee b/services/document-updater/app/coffee/ShareJsUpdateManager.coffee index 5f3cba4fbc..278a104beb 100644 --- a/services/document-updater/app/coffee/ShareJsUpdateManager.coffee +++ b/services/document-updater/app/coffee/ShareJsUpdateManager.coffee @@ -7,10 +7,9 @@ Keys = require "./RedisKeyBuilder" {EventEmitter} = require "events" util = require "util" -redis = require('redis') -redisConf = Settings.redis.web -rclient = redis.createClient(redisConf.port, redisConf.host) -rclient.auth(redisConf.password) +redis = require("redis-sharelatex") +rclient = redis.createClient(Settings.redis.web) + ShareJsModel:: = {} util.inherits ShareJsModel, EventEmitter diff --git a/services/document-updater/package.json b/services/document-updater/package.json index d3af868c5f..6318b7b060 100644 --- a/services/document-updater/package.json +++ b/services/document-updater/package.json @@ -9,7 +9,6 @@ "dependencies": { "express": "3.3.4", "underscore": "1.2.2", - "redis": "0.7.2", "chai": "", "request": "2.25.0", "sandboxed-module": "~0.2.0", @@ -21,7 +20,8 @@ "logger-sharelatex": "git+https://github.com/sharelatex/logger-sharelatex.git#v1.0.0", "metrics-sharelatex": "git+https://github.com/sharelatex/metrics-sharelatex.git#v1.0.0", "sinon": "~1.5.2", - "mongojs": "0.9.11" + "mongojs": "0.9.11", + "redis-sharelatex": "~0.0.4" }, "devDependencies": { "grunt-execute": "~0.1.5", diff --git a/services/document-updater/test/unit/coffee/AddingDocsToMemory.coffee b/services/document-updater/test/unit/coffee/AddingDocsToMemory.coffee index ffed682321..328eb13b8c 100644 --- a/services/document-updater/test/unit/coffee/AddingDocsToMemory.coffee +++ b/services/document-updater/test/unit/coffee/AddingDocsToMemory.coffee @@ -22,7 +22,7 @@ describe 'putting a doc into memory', ()-> mocks = "logger-sharelatex": log:-> - redis: + "redis-sharelatex": createClient : ()-> auth:-> multi: ()-> diff --git a/services/document-updater/test/unit/coffee/CheckingUpdatesLength.coffee b/services/document-updater/test/unit/coffee/CheckingUpdatesLength.coffee index 4f76c48ae7..de04724fef 100644 --- a/services/document-updater/test/unit/coffee/CheckingUpdatesLength.coffee +++ b/services/document-updater/test/unit/coffee/CheckingUpdatesLength.coffee @@ -13,7 +13,7 @@ describe 'Document Manager - getUpdatesLength ', -> @llenStub = sinon.stub() @redisManager = SandboxedModule.require modulePath, requires: - redis: + "redis-sharelatex": createClient:=> auth:-> llen:@llenStub diff --git a/services/document-updater/test/unit/coffee/DispatchManager/DispatchManagerTests.coffee b/services/document-updater/test/unit/coffee/DispatchManager/DispatchManagerTests.coffee index 3d4be1cfec..2b38b8f077 100644 --- a/services/document-updater/test/unit/coffee/DispatchManager/DispatchManagerTests.coffee +++ b/services/document-updater/test/unit/coffee/DispatchManager/DispatchManagerTests.coffee @@ -12,7 +12,7 @@ describe "DispatchManager", -> "settings-sharelatex": @settings = redis: web: {} - "redis": @redis = {} + "redis-sharelatex": @redis = {} @callback = sinon.stub() describe "each worker", -> diff --git a/services/document-updater/test/unit/coffee/GettingDoc.coffee b/services/document-updater/test/unit/coffee/GettingDoc.coffee index 824fe14a3f..0b4b466c24 100644 --- a/services/document-updater/test/unit/coffee/GettingDoc.coffee +++ b/services/document-updater/test/unit/coffee/GettingDoc.coffee @@ -4,14 +4,14 @@ should = chai.should() modulePath = "../../../app/js/RedisManager.js" SandboxedModule = require('sandboxed-module') -describe 'RedisManager - getDoc', -> +describe 'RedisManager.getDoc', -> beforeEach -> @rclient = {} @rclient.auth = () -> @rclient.multi = () => @rclient @RedisManager = SandboxedModule.require modulePath, requires: - "redis": @redis = + "redis-sharelatex": @redis = createClient: () => @rclient @doc_id = "doc-id-123" diff --git a/services/document-updater/test/unit/coffee/GettingListOfPendingUpdates.coffee b/services/document-updater/test/unit/coffee/GettingListOfPendingUpdates.coffee index 14f81f6052..10d1c39038 100644 --- a/services/document-updater/test/unit/coffee/GettingListOfPendingUpdates.coffee +++ b/services/document-updater/test/unit/coffee/GettingListOfPendingUpdates.coffee @@ -18,7 +18,7 @@ describe 'getting entire list of pending updates', ()-> redisReturn = [] mocks = - redis: + "redis-sharelatex": createClient: ()-> auth:-> multi: ()-> diff --git a/services/document-updater/test/unit/coffee/GettingTotalNumberOfDocs.coffee b/services/document-updater/test/unit/coffee/GettingTotalNumberOfDocs.coffee index 3b4f449f94..bac04361c3 100644 --- a/services/document-updater/test/unit/coffee/GettingTotalNumberOfDocs.coffee +++ b/services/document-updater/test/unit/coffee/GettingTotalNumberOfDocs.coffee @@ -19,7 +19,7 @@ describe 'getting cound of docs from memory', ()-> beforeEach (done)-> mocks = "logger-sharelatex": log:-> - redis: + "redis-sharelatex": createClient : ()-> auth:-> smembers:(key, callback)-> diff --git a/services/document-updater/test/unit/coffee/LockManager/CheckingTheLock.coffee b/services/document-updater/test/unit/coffee/LockManager/CheckingTheLock.coffee index fe744d2379..598c4903c2 100644 --- a/services/document-updater/test/unit/coffee/LockManager/CheckingTheLock.coffee +++ b/services/document-updater/test/unit/coffee/LockManager/CheckingTheLock.coffee @@ -19,7 +19,7 @@ describe 'Lock Manager - checking the lock', ()-> mocks = "logger-sharelatex": log:-> - redis: + "redis-sharelatex": createClient : ()-> auth:-> multi: -> diff --git a/services/document-updater/test/unit/coffee/LockManager/ReleasingTheLock.coffee b/services/document-updater/test/unit/coffee/LockManager/ReleasingTheLock.coffee index 39f16b09b9..4ae75e7719 100644 --- a/services/document-updater/test/unit/coffee/LockManager/ReleasingTheLock.coffee +++ b/services/document-updater/test/unit/coffee/LockManager/ReleasingTheLock.coffee @@ -14,7 +14,7 @@ describe 'LockManager - releasing the lock', ()-> mocks = "logger-sharelatex": log:-> - redis: + "redis-sharelatex": createClient : ()-> auth:-> del:deleteStub diff --git a/services/document-updater/test/unit/coffee/LockManager/getLockTests.coffee b/services/document-updater/test/unit/coffee/LockManager/getLockTests.coffee index f378650d95..ee88dfb2db 100644 --- a/services/document-updater/test/unit/coffee/LockManager/getLockTests.coffee +++ b/services/document-updater/test/unit/coffee/LockManager/getLockTests.coffee @@ -8,7 +8,7 @@ describe 'LockManager - getting the lock', -> beforeEach -> @LockManager = SandboxedModule.require modulePath, requires: "logger-sharelatex": log:-> - redis: + "redis-sharelatex": createClient : () => auth:-> @callback = sinon.stub() diff --git a/services/document-updater/test/unit/coffee/LockManager/tryLockTests.coffee b/services/document-updater/test/unit/coffee/LockManager/tryLockTests.coffee index 6c2c8972af..c828399c12 100644 --- a/services/document-updater/test/unit/coffee/LockManager/tryLockTests.coffee +++ b/services/document-updater/test/unit/coffee/LockManager/tryLockTests.coffee @@ -8,7 +8,7 @@ describe 'LockManager - trying the lock', -> beforeEach -> @LockManager = SandboxedModule.require modulePath, requires: "logger-sharelatex": log:-> - redis: + "redis-sharelatex": createClient : () => auth:-> set: @set = sinon.stub() diff --git a/services/document-updater/test/unit/coffee/RedisManager/clearDocFromPendingUpdatesSetTests.coffee b/services/document-updater/test/unit/coffee/RedisManager/clearDocFromPendingUpdatesSetTests.coffee index 016d96a2ae..81eb0bfefe 100644 --- a/services/document-updater/test/unit/coffee/RedisManager/clearDocFromPendingUpdatesSetTests.coffee +++ b/services/document-updater/test/unit/coffee/RedisManager/clearDocFromPendingUpdatesSetTests.coffee @@ -10,7 +10,7 @@ describe "RedisManager.clearDocFromPendingUpdatesSet", -> @doc_id = "document-id" @callback = sinon.stub() @RedisManager = SandboxedModule.require modulePath, requires: - "redis" : createClient: () => + "redis-sharelatex" : createClient: () => @rclient = auth:-> "logger-sharelatex": {} diff --git a/services/document-updater/test/unit/coffee/RedisManager/getDocsWithPendingUpdatesTests.coffee b/services/document-updater/test/unit/coffee/RedisManager/getDocsWithPendingUpdatesTests.coffee index d179b45f9d..5bbb93a723 100644 --- a/services/document-updater/test/unit/coffee/RedisManager/getDocsWithPendingUpdatesTests.coffee +++ b/services/document-updater/test/unit/coffee/RedisManager/getDocsWithPendingUpdatesTests.coffee @@ -8,7 +8,7 @@ describe "RedisManager.getDocsWithPendingUpdates", -> beforeEach -> @callback = sinon.stub() @RedisManager = SandboxedModule.require modulePath, requires: - "redis" : createClient: () => + "redis-sharelatex" : createClient: () => @rclient = auth:-> "logger-sharelatex": {} diff --git a/services/document-updater/test/unit/coffee/RedisManager/getPendingUpdatesForDocTests.coffee b/services/document-updater/test/unit/coffee/RedisManager/getPendingUpdatesForDocTests.coffee index 4910f1498f..9c70033eb4 100644 --- a/services/document-updater/test/unit/coffee/RedisManager/getPendingUpdatesForDocTests.coffee +++ b/services/document-updater/test/unit/coffee/RedisManager/getPendingUpdatesForDocTests.coffee @@ -7,7 +7,7 @@ SandboxedModule = require('sandboxed-module') describe "RedisManager.getPendingUpdatesForDoc", -> beforeEach -> @RedisManager = SandboxedModule.require modulePath, requires: - "redis": createClient: () => + "redis-sharelatex": createClient: () => @rclient = auth: () -> multi: () => @rclient diff --git a/services/document-updater/test/unit/coffee/RedisManager/getPreviousDocOpsTests.coffee b/services/document-updater/test/unit/coffee/RedisManager/getPreviousDocOpsTests.coffee index 775418313e..6cd4980fd8 100644 --- a/services/document-updater/test/unit/coffee/RedisManager/getPreviousDocOpsTests.coffee +++ b/services/document-updater/test/unit/coffee/RedisManager/getPreviousDocOpsTests.coffee @@ -8,7 +8,7 @@ describe "RedisManager.getPreviousDocOpsTests", -> beforeEach -> @callback = sinon.stub() @RedisManager = SandboxedModule.require modulePath, requires: - "redis" : createClient: () => + "redis-sharelatex" : createClient: () => @rclient = auth: -> multi: => @rclient diff --git a/services/document-updater/test/unit/coffee/RedisManager/pushDocOpTests.coffee b/services/document-updater/test/unit/coffee/RedisManager/pushDocOpTests.coffee index 247862a257..71a36bb4f3 100644 --- a/services/document-updater/test/unit/coffee/RedisManager/pushDocOpTests.coffee +++ b/services/document-updater/test/unit/coffee/RedisManager/pushDocOpTests.coffee @@ -7,7 +7,7 @@ SandboxedModule = require('sandboxed-module') describe "RedisManager.pushDocOp", -> beforeEach -> @RedisManager = SandboxedModule.require modulePath, requires: - "redis": createClient: () => + "redis-sharelatex": createClient: () => @rclient = auth: () -> multi: () => @rclient diff --git a/services/document-updater/test/unit/coffee/RedisManager/pushUncompressedHistoryOpTests.coffee b/services/document-updater/test/unit/coffee/RedisManager/pushUncompressedHistoryOpTests.coffee index d6e19f163e..621a3b1a3b 100644 --- a/services/document-updater/test/unit/coffee/RedisManager/pushUncompressedHistoryOpTests.coffee +++ b/services/document-updater/test/unit/coffee/RedisManager/pushUncompressedHistoryOpTests.coffee @@ -7,7 +7,7 @@ SandboxedModule = require('sandboxed-module') describe "RedisManager.pushUncompressedHistoryOp", -> beforeEach -> @RedisManager = SandboxedModule.require modulePath, requires: - "redis": createClient: () => + "redis-sharelatex": createClient: () => @rclient = auth: () -> multi: () => @rclient diff --git a/services/document-updater/test/unit/coffee/RemovingSingleDocFromMemory.coffee b/services/document-updater/test/unit/coffee/RemovingSingleDocFromMemory.coffee index be18d41c57..aad1e94804 100644 --- a/services/document-updater/test/unit/coffee/RemovingSingleDocFromMemory.coffee +++ b/services/document-updater/test/unit/coffee/RemovingSingleDocFromMemory.coffee @@ -24,7 +24,7 @@ describe 'removing single doc from memory', ()-> "logger-sharelatex": error:-> log:-> - redis: + "redis-sharelatex": createClient : -> auth:-> multi: -> diff --git a/services/document-updater/test/unit/coffee/ShareJsUpdateManagerTests.coffee b/services/document-updater/test/unit/coffee/ShareJsUpdateManagerTests.coffee index 20e737fc97..ecccc91a7e 100644 --- a/services/document-updater/test/unit/coffee/ShareJsUpdateManagerTests.coffee +++ b/services/document-updater/test/unit/coffee/ShareJsUpdateManagerTests.coffee @@ -15,7 +15,7 @@ describe "ShareJsUpdateManager", -> class Model constructor: (@db) -> "./ShareJsDB" : @ShareJsDB = { mockDB: true } - "redis" : createClient: () => @rclient = auth:-> + "redis-sharelatex" : createClient: () => @rclient = auth:-> "logger-sharelatex": @logger = { log: sinon.stub() } globals: clearTimeout: @clearTimeout = sinon.stub()