Merge branch 'redis-sentinal'

services/web/app/coffee/Features/Compile/CompileManager.coffee

@@ -1,7 +1,8 @@
 Settings = require('settings-sharelatex')
-redis = require('redis')
-rclient = redis.createClient(Settings.redis.web.port, Settings.redis.web.host)
-rclient.auth(Settings.redis.web.password)
+
+redis = require("redis-sharelatex")
+rclient = redis.createClient(Settings.redis.web)
+
 DocumentUpdaterHandler = require "../DocumentUpdater/DocumentUpdaterHandler"
 Project = require("../../models/Project").Project
 ProjectRootDocManager = require "../Project/ProjectRootDocManager"

services/web/app/coffee/Features/ConnectedUsers/ConnectedUsersManager.coffee

@@ -2,9 +2,8 @@ _ = require("underscore")
 async = require("async")
 Settings = require('settings-sharelatex')
 logger = require("logger-sharelatex")
-redis = require('redis')
-rclient = redis.createClient(Settings.redis.web.port, Settings.redis.web.host)
-rclient.auth(Settings.redis.web.password)
+redis = require("redis-sharelatex")
+rclient = redis.createClient(Settings.redis.web)
 
 
 ONE_HOUR_IN_S = 60 * 60

services/web/app/coffee/Features/DocumentUpdater/DocumentUpdaterHandler.coffee

@@ -7,9 +7,8 @@ async = require 'async'
 logger = require('logger-sharelatex')
 metrics = require('../../infrastructure/Metrics')
 slReqIdHelper = require('soa-req-id')
-redis = require('redis')
-rclient = redis.createClient(settings.redis.web.port, settings.redis.web.host)
-rclient.auth(settings.redis.web.password)
+redis = require("redis-sharelatex")
+rclient = redis.createClient(settings.redis.web)
 Project = require("../../models/Project").Project
 ProjectLocator = require('../../Features/Project/ProjectLocator')
 

services/web/app/coffee/Features/Dropbox/DropboxWebhookHandler.coffee

@@ -4,9 +4,8 @@ async = require "async"
 User = require("../../models/User").User
 TpdsUpdateSender = require "../ThirdPartyDataStore/TpdsUpdateSender"
 
-redis = require('redis')
-rclient = redis.createClient(settings.redis.web.port, settings.redis.web.host)
-rclient.auth(settings.redis.web.password)
+redis = require("redis-sharelatex")
+rclient = redis.createClient(settings.redis.web)
 
 module.exports = DropboxWebhookHandler =
 	pollDropboxUids: (dropbox_uids, callback = (error) ->) ->

services/web/app/coffee/Features/Editor/EditorController.coffee

@@ -13,15 +13,14 @@ LimitationsManager = require("../Subscription/LimitationsManager")
 AuthorizationManager = require("../Security/AuthorizationManager")
 EditorRealTimeController = require("./EditorRealTimeController")
 TrackChangesManager = require("../TrackChanges/TrackChangesManager")
-settings = require('settings-sharelatex')
+Settings = require('settings-sharelatex')
 slReqIdHelper = require('soa-req-id')
 async = require('async')
 ConnectedUsersManager = require("../ConnectedUsers/ConnectedUsersManager")
 _ = require('underscore')
-rclientPub = require("redis").createClient(settings.redis.web.port, settings.redis.web.host)
-rclientPub.auth(settings.redis.web.password)
-rclientSub = require("redis").createClient(settings.redis.web.port, settings.redis.web.host)
-rclientSub.auth(settings.redis.web.password)
+redis = require("redis-sharelatex")
+rclientPub = redis.createClient(Settings.redis.web)
+rclientSub = redis.createClient(Settings.redis.web)
 
 module.exports = EditorController =
 	protocolVersion: 2

services/web/app/coffee/Features/Editor/EditorRealTimeController.coffee

@@ -1,8 +1,7 @@
-settings = require 'settings-sharelatex'
-rclientPub = require("redis").createClient(settings.redis.web.port, settings.redis.web.host)
-rclientPub.auth(settings.redis.web.password)
-rclientSub = require("redis").createClient(settings.redis.web.port, settings.redis.web.host)
-rclientSub.auth(settings.redis.web.password)
+Settings = require 'settings-sharelatex'
+redis = require("redis-sharelatex")
+rclientPub = redis.createClient(Settings.redis.web)
+rclientSub = redis.createClient(Settings.redis.web)
 
 module.exports = EditorRealTimeController =
 	rclientPub: rclientPub

services/web/app/coffee/Features/Editor/EditorUpdatesController.coffee

@@ -1,8 +1,8 @@
 logger = require "logger-sharelatex"
 metrics = require('../../infrastructure/Metrics')
 Settings = require 'settings-sharelatex'
-rclient = require("redis").createClient(Settings.redis.web.port, Settings.redis.web.host)
-rclient.auth(Settings.redis.web.password)
+redis = require("redis-sharelatex")
+rclient = redis.createClient(Settings.redis.web)
 DocumentUpdaterHandler = require('../DocumentUpdater/DocumentUpdaterHandler')
 EditorRealTimeController = require("./EditorRealTimeController")
 

services/web/app/coffee/Features/PasswordReset/PasswordResetTokenHandler.coffee

@@ -1,7 +1,6 @@
 Settings = require('settings-sharelatex')
-redis = require('redis')
-rclient = redis.createClient(Settings.redis.web.port, Settings.redis.web.host)
-rclient.auth(Settings.redis.web.password)
+redis = require("redis-sharelatex")
+rclient = redis.createClient(Settings.redis.web)
 crypto = require("crypto")
 logger = require("logger-sharelatex")
 

services/web/app/coffee/Features/Security/LoginRateLimiter.coffee

@@ -1,7 +1,6 @@
 Settings = require('settings-sharelatex')
-redis = require('redis')
-rclient = redis.createClient(Settings.redis.web.port, Settings.redis.web.host)
-rclient.auth(Settings.redis.web.password)
+redis = require("redis-sharelatex")
+rclient = redis.createClient(Settings.redis.web)
 
 buildKey = (k)->
 	return "LoginRateLimit:#{k}"

services/web/app/coffee/Features/ServerAdmin/AdminController.coffee

@@ -6,9 +6,8 @@ Project = require('../../models/Project').Project
 DocumentUpdaterHandler = require('../DocumentUpdater/DocumentUpdaterHandler')
 Settings = require('settings-sharelatex')
 util = require('util')
-redis = require('redis')
-rclient = redis.createClient(Settings.redis.web.port, Settings.redis.web.host)
-rclient.auth(Settings.redis.web.password)
+redis = require("redis-sharelatex")
+rclient = redis.createClient(Settings.redis.web)
 RecurlyWrapper = require('../Subscription/RecurlyWrapper')
 SubscriptionHandler = require('../Subscription/SubscriptionHandler')
 projectEntityHandler = require('../Project/ProjectEntityHandler')

services/web/app/coffee/infrastructure/RateLimiter.coffee

@@ -1,7 +1,6 @@
 settings = require("settings-sharelatex")
-redis = require('redis')
-rclient = redis.createClient(settings.redis.web.port, settings.redis.web.host)
-rclient.auth(settings.redis.web.password)
+redis = require("redis-sharelatex")
+rclient = redis.createClient(settings.redis.web)
 redback = require("redback").use(rclient)
 
 module.exports =

services/web/app/coffee/infrastructure/Server.coffee

@@ -9,10 +9,15 @@ socketIoConfig = require('./SocketIoConfig')
 soareqid = require('soa-req-id')
 Router = require('../router')
 metrics.inc("startup")
-redis = require('redis')
-RedisStore = require('connect-redis')(express)
 SessionSockets = require('session.socket.io')
-sessionStore = new RedisStore(host:Settings.redis.web.host, port:Settings.redis.web.port, pass:Settings.redis.web.password)
+
+
+redis = require("redis-sharelatex")
+rclient = redis.createClient(Settings.redis.web)
+
+RedisStore = require('connect-redis')(express)
+sessionStore = new RedisStore(client:rclient)
+
 cookieParser = express.cookieParser(Settings.security.sessionSecret)
 oneDayInMilliseconds = 86400000
 ReferalConnect = require('../Features/Referal/ReferalConnect')

services/web/package.json

@@ -3,44 +3,45 @@
   "version": "0.1.0",
   "description": "The HTTP front end for ShareLaTeX",
   "repository": {
-    "type": "git", 
+    "type": "git",
     "url": "https://github.com/sharelatex/web-sharelatex.git"
   },
   "directories": {
     "public": "./public"
   },
   "dependencies": {
-    "express": "3.3.4",
-    "mongoose": "3.8.8",
-    "mongojs": "0.10.1",
-    "underscore": "1.6.0",
-    "rimraf": "2.2.6",
-    "connect-redis": "1.4.5",
-    "redis": "0.10.1",
-    "request": "2.34.0",
-    "xml2js": "0.2.0",
-    "dateformat": "1.0.4-1.2.3",
-    "optimist": "0.6.1",
+    "archiver": "0.9.0",
     "async": "0.6.2",
-    "lynx": "0.1.1",
-    "session.socket.io": "0.1.4",
-    "socket.io": "0.9.16",
-    "mimelib": "0.2.14",
+    "bcrypt": "0.7.5",
     "bufferedstream": "1.6.0",
-    "settings-sharelatex": "git+https://github.com/sharelatex/settings-sharelatex.git#v1.0.0",
+    "connect-redis": "1.4.5",
+    "dateformat": "1.0.4-1.2.3",
+    "express": "3.3.4",
+    "fairy": "0.0.2",
+    "jade": "~1.3.1",
     "logger-sharelatex": "git+https://github.com/sharelatex/logger-sharelatex.git#v1.0.0",
+    "lynx": "0.1.1",
     "metrics-sharelatex": "git+https://github.com/sharelatex/metrics-sharelatex.git#v1.0.0",
-    "translations-sharelatex": "git+https://github.com/sharelatex/translations-sharelatex.git#master",
-    "soa-req-id": "git+https://github.com/sharelatex/soa-req-id.git#v1.0.0",
-    "fairy": "0.0.2",
+    "mimelib": "0.2.14",
+    "mocha": "1.17.1",
+    "mongojs": "0.10.1",
+    "mongoose": "3.8.8",
     "node-uuid": "1.4.1",
     "nodemailer": "0.6.1",
-    "bcrypt": "0.7.5",
-    "archiver": "0.9.0",
-    "mocha": "1.17.1",
+    "optimist": "0.6.1",
     "redback": "0.4.0",
+    "redis": "0.10.1",
+    "redis-sharelatex": "0.0.1",
+    "request": "2.34.0",
+    "rimraf": "2.2.6",
     "sanitizer": "0.1.1",
-    "jade": "~1.3.1"
+    "session.socket.io": "0.1.4",
+    "settings-sharelatex": "git+https://github.com/sharelatex/settings-sharelatex.git#v1.0.0",
+    "soa-req-id": "git+https://github.com/sharelatex/soa-req-id.git#v1.0.0",
+    "socket.io": "0.9.16",
+    "translations-sharelatex": "git+https://github.com/sharelatex/translations-sharelatex.git#master",
+    "underscore": "1.6.0",
+    "xml2js": "0.2.0"
   },
   "devDependencies": {
     "chai": "",