From a0bb289fd334a56dbfd475dfbbf08ad5f510cd9e Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Fri, 26 Sep 2014 17:21:33 +0100 Subject: [PATCH] works with sentinal v1 --- services/track-changes/app/coffee/LockManager.coffee | 6 ++---- services/track-changes/app/coffee/RedisManager.coffee | 6 ++---- services/track-changes/package.json | 1 + 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/services/track-changes/app/coffee/LockManager.coffee b/services/track-changes/app/coffee/LockManager.coffee index 5f71a336fb..1b81687c36 100644 --- a/services/track-changes/app/coffee/LockManager.coffee +++ b/services/track-changes/app/coffee/LockManager.coffee @@ -1,8 +1,6 @@ Settings = require "settings-sharelatex" -redis = require('redis') -redisConf = Settings.redis?.web or {host: "localhost", port: 6379} -rclient = redis.createClient(redisConf.port, redisConf.host) -rclient.auth(redisConf.password) +redis = require("redis-sharelatex") +rclient = redis.createClient(Settings.redis.web) module.exports = LockManager = LOCK_TEST_INTERVAL: 50 # 50ms between each test of the lock diff --git a/services/track-changes/app/coffee/RedisManager.coffee b/services/track-changes/app/coffee/RedisManager.coffee index 676259d311..eec6ce5086 100644 --- a/services/track-changes/app/coffee/RedisManager.coffee +++ b/services/track-changes/app/coffee/RedisManager.coffee @@ -1,8 +1,6 @@ Settings = require "settings-sharelatex" -redis = require('redis') -redisConf = Settings.redis?.web or {host: "localhost", port: 6379} -rclient = redis.createClient(redisConf.port, redisConf.host) -rclient.auth(redisConf.password) +redis = require("redis-sharelatex") +rclient = redis.createClient(Settings.redis.web) rawUpdatesKey = (doc_id) -> "UncompressedHistoryOps:#{doc_id}" docsWithHistoryOpsKey = (project_id) -> "DocsWithHistoryOps:#{project_id}" diff --git a/services/track-changes/package.json b/services/track-changes/package.json index 945880b526..252fe6cdc6 100644 --- a/services/track-changes/package.json +++ b/services/track-changes/package.json @@ -9,6 +9,7 @@ "logger-sharelatex": "git+https://github.com/sharelatex/logger-sharelatex.git#master", "metrics-sharelatex": "git+https://github.com/sharelatex/metrics-sharelatex.git#master", "request": "~2.33.0", + "redis-sharelatex": "0.0.1", "redis": "~0.10.1" }, "devDependencies": {