Просмотр исходного кода

Point every redis connection to the new config

James Allen 12 лет назад
Родитель
Сommit
414b669a2c

+ 4 - 2
services/document-updater/app.coffee

@@ -7,12 +7,14 @@ RedisManager = require('./app/js/RedisManager.js')
 UpdateManager = require('./app/js/UpdateManager.js')
 Keys = require('./app/js/RedisKeyBuilder')
 redis = require('redis')
-rclient = redis.createClient(Settings.redis.port, Settings.redis.host)
-rclient.auth(Settings.redis.password)
 metrics = require('./app/js/Metrics')
 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)
+
 app = express()
 app.configure ->
 	app.use(express.logger(':remote-addr - [:date] - :user-agent ":method :url" :status - :response-time ms'));

+ 1 - 1
services/document-updater/app/coffee/LockManager.coffee

@@ -1,7 +1,7 @@
 metrics = require('./Metrics')
 Settings = require('settings-sharelatex')
 redis = require('redis')
-redisConf = Settings.redis?.web or Settings.redis or {host: "localhost", port: 6379}
+redisConf = Settings.redis.web
 rclient = redis.createClient(redisConf.port, redisConf.host)
 rclient.auth(redisConf.password)
 keys = require('./RedisKeyBuilder')

+ 1 - 1
services/document-updater/app/coffee/RedisManager.coffee

@@ -1,6 +1,6 @@
 Settings = require('settings-sharelatex')
 redis = require('redis')
-redisConf = Settings.redis?.web or Settings.redis or {host: "localhost", port: 6379}
+redisConf = Settings.redis.web
 rclient = redis.createClient(redisConf.port, redisConf.host)
 rclient.auth(redisConf.password)
 async = require('async')

+ 1 - 1
services/document-updater/app/coffee/ShareJsUpdateManager.coffee

@@ -8,7 +8,7 @@ Keys = require "./RedisKeyBuilder"
 util = require "util"
 
 redis = require('redis')
-redisConf = Settings.redis?.web or Settings.redis or {host: "localhost", port: 6379}
+redisConf = Settings.redis.web
 rclient = redis.createClient(redisConf.port, redisConf.host)
 rclient.auth(redisConf.password)