works with sentinal v1

This commit is contained in:
Henry Oswald 2014-09-26 17:22:02 +01:00
parent 57fc710be6
commit 672dd3de1b
6 changed files with 13 additions and 22 deletions

View file

@ -7,13 +7,11 @@ 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"

View file

@ -1,16 +1,14 @@
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: () ->
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) ->) ->

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"

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')

View file

@ -7,10 +7,8 @@ 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

View file

@ -21,7 +21,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.1"
},
"devDependencies": {
"grunt-execute": "~0.1.5",