From 9c85e9b848ac469128a5a9b78342645e71ac29e6 Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Mon, 29 Sep 2014 12:07:32 +0100 Subject: [PATCH] moved back to not include sentinal while we upgrade to 0.10.x node --- services/document-updater/app.coffee | 6 ++++-- .../document-updater/app/coffee/DispatchManager.coffee | 8 +++++--- services/document-updater/app/coffee/LockManager.coffee | 6 ++++-- services/document-updater/app/coffee/RedisManager.coffee | 6 ++++-- .../app/coffee/ShareJsUpdateManager.coffee | 6 ++++-- services/document-updater/package.json | 3 +-- .../test/unit/coffee/AddingDocsToMemory.coffee | 2 +- .../test/unit/coffee/CheckingUpdatesLength.coffee | 2 +- .../coffee/DispatchManager/DispatchManagerTests.coffee | 2 +- .../document-updater/test/unit/coffee/GettingDoc.coffee | 2 +- .../test/unit/coffee/GettingListOfPendingUpdates.coffee | 2 +- .../test/unit/coffee/GettingTotalNumberOfDocs.coffee | 2 +- .../test/unit/coffee/LockManager/CheckingTheLock.coffee | 2 +- .../test/unit/coffee/LockManager/ReleasingTheLock.coffee | 2 +- .../test/unit/coffee/LockManager/getLockTests.coffee | 2 +- .../test/unit/coffee/LockManager/tryLockTests.coffee | 2 +- .../clearDocFromPendingUpdatesSetTests.coffee | 2 +- .../RedisManager/getDocsWithPendingUpdatesTests.coffee | 2 +- .../RedisManager/getPendingUpdatesForDocTests.coffee | 2 +- .../coffee/RedisManager/getPreviousDocOpsTests.coffee | 2 +- .../test/unit/coffee/RedisManager/pushDocOpTests.coffee | 2 +- .../RedisManager/pushUncompressedHistoryOpTests.coffee | 2 +- .../test/unit/coffee/RemovingSingleDocFromMemory.coffee | 2 +- .../test/unit/coffee/ShareJsUpdateManagerTests.coffee | 2 +- 24 files changed, 40 insertions(+), 31 deletions(-) diff --git a/services/document-updater/app.coffee b/services/document-updater/app.coffee index c7840f608a..e246d366e8 100644 --- a/services/document-updater/app.coffee +++ b/services/document-updater/app.coffee @@ -7,11 +7,13 @@ 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" -redis = require("redis-sharelatex") -rclient = redis.createClient(Settings.redis.web) +redisConf = Settings.redis.web +rclient = redis.createClient(redisConf.port, redisConf.host) +rclient.auth(redisConf.password) 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 6078304f2a..afb1a5d176 100644 --- a/services/document-updater/app/coffee/DispatchManager.coffee +++ b/services/document-updater/app/coffee/DispatchManager.coffee @@ -1,14 +1,16 @@ Settings = require('settings-sharelatex') logger = require('logger-sharelatex') Keys = require('./RedisKeyBuilder') +redis = require('redis') UpdateManager = require('./UpdateManager') Metrics = require('./Metrics') -redis = require("redis-sharelatex") module.exports = DispatchManager = createDispatcher: () -> - client = redis.createClient(Settings.redis.web) - + redisConf = Settings.redis.web + client = redis.createClient(redisConf.port, redisConf.host) + client.auth(redisConf.password) + 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 0facb8519b..a43bd84a1b 100644 --- a/services/document-updater/app/coffee/LockManager.coffee +++ b/services/document-updater/app/coffee/LockManager.coffee @@ -1,7 +1,9 @@ metrics = require('./Metrics') Settings = require('settings-sharelatex') -redis = require("redis-sharelatex") -rclient = redis.createClient(Settings.redis.web) +redis = require('redis') +redisConf = Settings.redis.web +rclient = redis.createClient(redisConf.port, redisConf.host) +rclient.auth(redisConf.password) 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 6a920b42c4..9f3ad1bca2 100644 --- a/services/document-updater/app/coffee/RedisManager.coffee +++ b/services/document-updater/app/coffee/RedisManager.coffee @@ -1,6 +1,8 @@ Settings = require('settings-sharelatex') -redis = require("redis-sharelatex") -rclient = redis.createClient(Settings.redis.web) +redis = require('redis') +redisConf = Settings.redis.web +rclient = redis.createClient(redisConf.port, redisConf.host) +rclient.auth(redisConf.password) 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 d842ccce2d..5f3cba4fbc 100644 --- a/services/document-updater/app/coffee/ShareJsUpdateManager.coffee +++ b/services/document-updater/app/coffee/ShareJsUpdateManager.coffee @@ -7,8 +7,10 @@ Keys = require "./RedisKeyBuilder" {EventEmitter} = require "events" util = require "util" -redis = require("redis-sharelatex") -rclient = redis.createClient(Settings.redis.web) +redis = require('redis') +redisConf = Settings.redis.web +rclient = redis.createClient(redisConf.port, redisConf.host) +rclient.auth(redisConf.password) ShareJsModel:: = {} util.inherits ShareJsModel, EventEmitter diff --git a/services/document-updater/package.json b/services/document-updater/package.json index a56b05372c..d3af868c5f 100644 --- a/services/document-updater/package.json +++ b/services/document-updater/package.json @@ -21,8 +21,7 @@ "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", - "redis-sharelatex": "0.0.3" + "mongojs": "0.9.11" }, "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 328eb13b8c..ffed682321 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-sharelatex": + redis: createClient : ()-> auth:-> multi: ()-> diff --git a/services/document-updater/test/unit/coffee/CheckingUpdatesLength.coffee b/services/document-updater/test/unit/coffee/CheckingUpdatesLength.coffee index de04724fef..4f76c48ae7 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-sharelatex": + redis: 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 2b38b8f077..3d4be1cfec 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-sharelatex": @redis = {} + "redis": @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 6796f4c8bb..824fe14a3f 100644 --- a/services/document-updater/test/unit/coffee/GettingDoc.coffee +++ b/services/document-updater/test/unit/coffee/GettingDoc.coffee @@ -11,7 +11,7 @@ describe 'RedisManager - getDoc', -> @rclient.multi = () => @rclient @RedisManager = SandboxedModule.require modulePath, requires: - "redis-sharelatex": @redis = + "redis": @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 10d1c39038..14f81f6052 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-sharelatex": + redis: createClient: ()-> auth:-> multi: ()-> diff --git a/services/document-updater/test/unit/coffee/GettingTotalNumberOfDocs.coffee b/services/document-updater/test/unit/coffee/GettingTotalNumberOfDocs.coffee index bac04361c3..3b4f449f94 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-sharelatex": + redis: 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 598c4903c2..fe744d2379 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-sharelatex": + redis: 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 4ae75e7719..39f16b09b9 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-sharelatex": + redis: 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 ee88dfb2db..f378650d95 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-sharelatex": + redis: 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 c828399c12..6c2c8972af 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-sharelatex": + redis: 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 81eb0bfefe..016d96a2ae 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-sharelatex" : createClient: () => + "redis" : 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 5bbb93a723..d179b45f9d 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-sharelatex" : createClient: () => + "redis" : 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 9c70033eb4..4910f1498f 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-sharelatex": createClient: () => + "redis": 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 6cd4980fd8..775418313e 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-sharelatex" : createClient: () => + "redis" : 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 71a36bb4f3..247862a257 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-sharelatex": createClient: () => + "redis": 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 621a3b1a3b..d6e19f163e 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-sharelatex": createClient: () => + "redis": 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 aad1e94804..be18d41c57 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-sharelatex": + redis: createClient : -> auth:-> multi: -> diff --git a/services/document-updater/test/unit/coffee/ShareJsUpdateManagerTests.coffee b/services/document-updater/test/unit/coffee/ShareJsUpdateManagerTests.coffee index ecccc91a7e..20e737fc97 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-sharelatex" : createClient: () => @rclient = auth:-> + "redis" : createClient: () => @rclient = auth:-> "logger-sharelatex": @logger = { log: sinon.stub() } globals: clearTimeout: @clearTimeout = sinon.stub()