agw/overleaf-cep
1
0
Fork 0
mirror of https://github.com/yu-i-i/overleaf-cep.git synced 2026-06-11 07:00:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

implemeneted redis-sharelatex

Browse Source
This commit is contained in:
Henry Oswald
2014-10-07 12:08:36 +01:00
parent 9c85e9b848
commit 5ff8983528
24 changed files with 34 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/document-updater/app.coffee
+3 -4
View File
@@ -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"
services/document-updater/app/coffee/DispatchManager.coffee
+3 -5
View File
@@ -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) ->) ->
services/document-updater/app/coffee/LockManager.coffee
+2 -4
View File
@@ -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"
services/document-updater/app/coffee/RedisManager.coffee
+2 -4
View File
@@ -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')
services/document-updater/app/coffee/ShareJsUpdateManager.coffee
+3 -4
View File
@@ -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
services/document-updater/package.json
+2 -2
View File
@@ -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",
services/document-updater/test/unit/coffee/AddingDocsToMemory.coffee
+1 -1
View File
@@ -22,7 +22,7 @@ describe 'putting a doc into memory', ()->
mocks =
"logger-sharelatex": log:->
redis:
"redis-sharelatex":
createClient : ()->
auth:->
multi: ()->
services/document-updater/test/unit/coffee/CheckingUpdatesLength.coffee
+1 -1
View File
@@ -13,7 +13,7 @@ describe 'Document Manager - getUpdatesLength ', ->
@llenStub = sinon.stub()
@redisManager = SandboxedModule.require modulePath, requires:
redis:
"redis-sharelatex":
createClient:=>
auth:->
llen:@llenStub
services/document-updater/test/unit/coffee/DispatchManager/DispatchManagerTests.coffee
+1 -1
View File
@@ -12,7 +12,7 @@ describe "DispatchManager", ->
"settings-sharelatex": @settings =
redis:
web: {}
"redis": @redis = {}
"redis-sharelatex": @redis = {}
@callback = sinon.stub()
describe "each worker", ->
services/document-updater/test/unit/coffee/GettingDoc.coffee
+2 -2
View File
@@ -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"
services/document-updater/test/unit/coffee/GettingListOfPendingUpdates.coffee
+1 -1
View File
@@ -18,7 +18,7 @@ describe 'getting entire list of pending updates', ()->
redisReturn = []
mocks =
redis:
"redis-sharelatex":
createClient: ()->
auth:->
multi: ()->
services/document-updater/test/unit/coffee/GettingTotalNumberOfDocs.coffee
+1 -1
View File
@@ -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)->
services/document-updater/test/unit/coffee/LockManager/CheckingTheLock.coffee
+1 -1
View File
@@ -19,7 +19,7 @@ describe 'Lock Manager - checking the lock', ()->
mocks =
"logger-sharelatex": log:->
redis:
"redis-sharelatex":
createClient : ()->
auth:->
multi: ->
services/document-updater/test/unit/coffee/LockManager/ReleasingTheLock.coffee
+1 -1
View File
@@ -14,7 +14,7 @@ describe 'LockManager - releasing the lock', ()->
mocks =
"logger-sharelatex": log:->
redis:
"redis-sharelatex":
createClient : ()->
auth:->
del:deleteStub
services/document-updater/test/unit/coffee/LockManager/getLockTests.coffee
+1 -1
View File
@@ -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()
services/document-updater/test/unit/coffee/LockManager/tryLockTests.coffee
+1 -1
View File
@@ -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()
services/document-updater/test/unit/coffee/RedisManager/clearDocFromPendingUpdatesSetTests.coffee
+1 -1
View File
@@ -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": {}
services/document-updater/test/unit/coffee/RedisManager/getDocsWithPendingUpdatesTests.coffee
+1 -1
View File
@@ -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": {}
services/document-updater/test/unit/coffee/RedisManager/getPendingUpdatesForDocTests.coffee
+1 -1
View File
@@ -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
services/document-updater/test/unit/coffee/RedisManager/getPreviousDocOpsTests.coffee
+1 -1
View File
@@ -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
services/document-updater/test/unit/coffee/RedisManager/pushDocOpTests.coffee
+1 -1
View File
@@ -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
services/document-updater/test/unit/coffee/RedisManager/pushUncompressedHistoryOpTests.coffee
+1 -1
View File
@@ -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
services/document-updater/test/unit/coffee/RemovingSingleDocFromMemory.coffee
+1 -1
View File
@@ -24,7 +24,7 @@ describe 'removing single doc from memory', ()->
"logger-sharelatex":
error:->
log:->
redis:
"redis-sharelatex":
createClient : ->
auth:->
multi: ->
services/document-updater/test/unit/coffee/ShareJsUpdateManagerTests.coffee
+1 -1
View File
@@ -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()