From f8cbc5d51ad3130215b453742426a718341fff71 Mon Sep 17 00:00:00 2001 From: James Allen Date: Tue, 18 Nov 2014 15:54:56 +0000 Subject: [PATCH 01/13] Pull redis from github master temporarily --- services/web/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/web/package.json b/services/web/package.json index 9b43687fd0..6a67008720 100644 --- a/services/web/package.json +++ b/services/web/package.json @@ -31,7 +31,7 @@ "optimist": "0.6.1", "redback": "0.4.0", "redis": "0.10.1", - "redis-sharelatex": "~0.0.4", + "redis-sharelatex": "git+https://github.com/sharelatex/redis-sharelatex.git#master", "request": "2.34.0", "rimraf": "2.2.6", "sanitizer": "0.1.1", From 22346f5532767f6cad9e839ddd130a4cb32a0595 Mon Sep 17 00:00:00 2001 From: James Allen Date: Tue, 18 Nov 2014 18:01:58 +0000 Subject: [PATCH 02/13] Revert "Pull redis from github master temporarily" This reverts commit 919fbdf8945bdd2cdb5ddda5a7ac8c5b7395597b. --- services/web/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/web/package.json b/services/web/package.json index 6a67008720..9b43687fd0 100644 --- a/services/web/package.json +++ b/services/web/package.json @@ -31,7 +31,7 @@ "optimist": "0.6.1", "redback": "0.4.0", "redis": "0.10.1", - "redis-sharelatex": "git+https://github.com/sharelatex/redis-sharelatex.git#master", + "redis-sharelatex": "~0.0.4", "request": "2.34.0", "rimraf": "2.2.6", "sanitizer": "0.1.1", From 5ec9e587f05aca9447460e39910c484b66442e99 Mon Sep 17 00:00:00 2001 From: James Allen Date: Wed, 19 Nov 2014 11:09:32 +0000 Subject: [PATCH 03/13] Roll back real-time settings for now --- services/web/config/settings.defaults.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/web/config/settings.defaults.coffee b/services/web/config/settings.defaults.coffee index 07ae5b6357..2c191e67f6 100644 --- a/services/web/config/settings.defaults.coffee +++ b/services/web/config/settings.defaults.coffee @@ -110,7 +110,7 @@ module.exports = # then websocketsUrl should be the same as siteUrl, with your reverse # proxy responible for sending websocket traffic to the websocket service # rather than connecting directly. - websocketsUrl: "http://localhost:3026" + websocketsUrl: "http://localhost:3000" # Where your instance of ShareLaTeX can be found publically. Used in emails # that are sent out, generated links, etc. From d6532c63f8458a91b3f32e4f0d065e405c4a3872 Mon Sep 17 00:00:00 2001 From: James Allen Date: Wed, 19 Nov 2014 11:09:42 +0000 Subject: [PATCH 04/13] Use new robust subscription model --- .../coffee/Features/Editor/EditorRealTimeController.coffee | 6 ++++-- .../coffee/Features/Editor/EditorUpdatesController.coffee | 7 +++++-- .../coffee/Editor/EditorRealTimeControllerTests.coffee | 2 ++ .../coffee/Editor/EditorUpdatesControllerTests.coffee | 2 +- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/services/web/app/coffee/Features/Editor/EditorRealTimeController.coffee b/services/web/app/coffee/Features/Editor/EditorRealTimeController.coffee index 76f4f909c1..924b8c66c6 100644 --- a/services/web/app/coffee/Features/Editor/EditorRealTimeController.coffee +++ b/services/web/app/coffee/Features/Editor/EditorRealTimeController.coffee @@ -1,7 +1,7 @@ Settings = require 'settings-sharelatex' redis = require("redis-sharelatex") rclientPub = redis.createClient(Settings.redis.web) -rclientSub = redis.createClient(Settings.redis.web) +rclientSub = redis.createRobustSubscriptionClient(Settings.redis.web) module.exports = EditorRealTimeController = rclientPub: rclientPub @@ -18,7 +18,9 @@ module.exports = EditorRealTimeController = listenForEditorEvents: () -> @rclientSub.subscribe "editor-events" - @rclientSub.on "message", @_processEditorEvent.bind(@) + @rclientSub.on "message", (channel, message) -> + return unless channel == "editor-events" + EditorRealTimeController._processEditorEvent(channel, message) _processEditorEvent: (channel, message) -> io = require('../../infrastructure/Server').io diff --git a/services/web/app/coffee/Features/Editor/EditorUpdatesController.coffee b/services/web/app/coffee/Features/Editor/EditorUpdatesController.coffee index 0233c67aaa..f626a7a3ca 100644 --- a/services/web/app/coffee/Features/Editor/EditorUpdatesController.coffee +++ b/services/web/app/coffee/Features/Editor/EditorUpdatesController.coffee @@ -2,10 +2,11 @@ logger = require "logger-sharelatex" metrics = require('../../infrastructure/Metrics') Settings = require 'settings-sharelatex' redis = require("redis-sharelatex") -rclient = redis.createClient(Settings.redis.web) DocumentUpdaterHandler = require('../DocumentUpdater/DocumentUpdaterHandler') EditorRealTimeController = require("./EditorRealTimeController") +rclient = redis.createRobustSubscriptionClient(Settings.redis.web) + module.exports = EditorUpdatesController = _applyUpdate: (client, project_id, doc_id, update, callback = (error) ->) -> metrics.inc "editor.doc-update", 0.3 @@ -30,7 +31,9 @@ module.exports = EditorUpdatesController = listenForUpdatesFromDocumentUpdater: () -> rclient.subscribe "applied-ops" - rclient.on "message", @_processMessageFromDocumentUpdater.bind(@) + rclient.on "message", (channel, message) -> + return unless channel == "applied-ops" + EditorUpdatesController._processMessageFromDocumentUpdater(channel, message) _processMessageFromDocumentUpdater: (channel, message) -> message = JSON.parse message diff --git a/services/web/test/UnitTests/coffee/Editor/EditorRealTimeControllerTests.coffee b/services/web/test/UnitTests/coffee/Editor/EditorRealTimeControllerTests.coffee index 9bb1fb3a04..80b5800758 100644 --- a/services/web/test/UnitTests/coffee/Editor/EditorRealTimeControllerTests.coffee +++ b/services/web/test/UnitTests/coffee/Editor/EditorRealTimeControllerTests.coffee @@ -9,6 +9,8 @@ describe "EditorRealTimeController", -> "redis-sharelatex": createClient: () -> auth:-> + createRobustSubscriptionClient: () -> + auth:-> "../../infrastructure/Server" : io: @io = {} @EditorRealTimeController.rclientPub = publish: sinon.stub() @EditorRealTimeController.rclientSub = diff --git a/services/web/test/UnitTests/coffee/Editor/EditorUpdatesControllerTests.coffee b/services/web/test/UnitTests/coffee/Editor/EditorUpdatesControllerTests.coffee index 74d6807bb5..ba39e921f1 100644 --- a/services/web/test/UnitTests/coffee/Editor/EditorUpdatesControllerTests.coffee +++ b/services/web/test/UnitTests/coffee/Editor/EditorUpdatesControllerTests.coffee @@ -18,7 +18,7 @@ describe "EditorUpdatesController", -> "../../infrastructure/Metrics" : @metrics = { set: sinon.stub(), inc: sinon.stub() } "../../infrastructure/Server" : io: @io = {} "redis-sharelatex" : - createClient: ()=> + createRobustSubscriptionClient: ()=> @rclient = {auth:->} describe "_applyUpdate", -> From 34e20e99f5ee57db683435a98c4938045f214e74 Mon Sep 17 00:00:00 2001 From: James Allen Date: Tue, 18 Nov 2014 15:54:56 +0000 Subject: [PATCH 05/13] Pull redis from github master temporarily --- services/web/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/web/package.json b/services/web/package.json index 9b43687fd0..6a67008720 100644 --- a/services/web/package.json +++ b/services/web/package.json @@ -31,7 +31,7 @@ "optimist": "0.6.1", "redback": "0.4.0", "redis": "0.10.1", - "redis-sharelatex": "~0.0.4", + "redis-sharelatex": "git+https://github.com/sharelatex/redis-sharelatex.git#master", "request": "2.34.0", "rimraf": "2.2.6", "sanitizer": "0.1.1", From 8b9a26d6f38f700ae524d2f5267d693eb74fd9fb Mon Sep 17 00:00:00 2001 From: James Allen Date: Wed, 19 Nov 2014 14:12:37 +0000 Subject: [PATCH 06/13] Add in http health check end points for redis subscription channels --- .../Features/Editor/EditorRealTimeController.coffee | 5 ++++- .../Features/Editor/EditorUpdatesController.coffee | 5 ++++- services/web/app/coffee/router.coffee | 13 +++++++++++++ .../Editor/EditorRealTimeControllerTests.coffee | 2 +- .../Editor/EditorUpdatesControllerTests.coffee | 2 +- 5 files changed, 23 insertions(+), 4 deletions(-) diff --git a/services/web/app/coffee/Features/Editor/EditorRealTimeController.coffee b/services/web/app/coffee/Features/Editor/EditorRealTimeController.coffee index 924b8c66c6..b5c1f511a4 100644 --- a/services/web/app/coffee/Features/Editor/EditorRealTimeController.coffee +++ b/services/web/app/coffee/Features/Editor/EditorRealTimeController.coffee @@ -1,11 +1,14 @@ Settings = require 'settings-sharelatex' redis = require("redis-sharelatex") rclientPub = redis.createClient(Settings.redis.web) -rclientSub = redis.createRobustSubscriptionClient(Settings.redis.web) +rclientSub = redis.createMonitoredSubscriptionClient(Settings.redis.web) module.exports = EditorRealTimeController = rclientPub: rclientPub rclientSub: rclientSub + + isRedisPubSubAlive: () -> + rclientSub.isAlive() emitToRoom: (room_id, message, payload...) -> @rclientPub.publish "editor-events", JSON.stringify diff --git a/services/web/app/coffee/Features/Editor/EditorUpdatesController.coffee b/services/web/app/coffee/Features/Editor/EditorUpdatesController.coffee index f626a7a3ca..23e206c504 100644 --- a/services/web/app/coffee/Features/Editor/EditorUpdatesController.coffee +++ b/services/web/app/coffee/Features/Editor/EditorUpdatesController.coffee @@ -5,7 +5,7 @@ redis = require("redis-sharelatex") DocumentUpdaterHandler = require('../DocumentUpdater/DocumentUpdaterHandler') EditorRealTimeController = require("./EditorRealTimeController") -rclient = redis.createRobustSubscriptionClient(Settings.redis.web) +rclient = redis.createMonitoredSubscriptionClient(Settings.redis.web) module.exports = EditorUpdatesController = _applyUpdate: (client, project_id, doc_id, update, callback = (error) ->) -> @@ -29,6 +29,9 @@ module.exports = EditorUpdatesController = update.meta.user_id = user_id EditorUpdatesController._applyUpdate client, project_id, doc_id, update + isRedisPubSubAlive: () -> + rclient.isAlive() + listenForUpdatesFromDocumentUpdater: () -> rclient.subscribe "applied-ops" rclient.on "message", (channel, message) -> diff --git a/services/web/app/coffee/router.coffee b/services/web/app/coffee/router.coffee index aaf81a8f16..ae5436cfd7 100644 --- a/services/web/app/coffee/router.coffee +++ b/services/web/app/coffee/router.coffee @@ -8,6 +8,7 @@ AuthorizationManager = require('./Features/Security/AuthorizationManager') EditorController = require("./Features/Editor/EditorController") EditorRouter = require("./Features/Editor/EditorRouter") EditorUpdatesController = require("./Features/Editor/EditorUpdatesController") +EditorRealTimeController = require("./Features/Editor/EditorRealTimeController") Settings = require('settings-sharelatex') TpdsController = require('./Features/ThirdPartyDataStore/TpdsController') SubscriptionRouter = require './Features/Subscription/SubscriptionRouter' @@ -175,6 +176,18 @@ module.exports = class Router req.session.destroy() app.get '/health_check', HealthCheckController.check + + app.get '/health_check/redis/doc_updates', (req, res, next) -> + if EditorUpdatesController.isRedisPubSubAlive() + res.send(200) + else + res.send(500) + + app.get '/health_check/redis/websockets', (req, res, next) -> + if EditorRealTimeController.isRedisPubSubAlive() + res.send(200) + else + res.send(500) app.get "/status/compiler/:Project_id", SecurityManager.requestCanAccessProject, (req, res) -> sendRes = _.once (statusCode, message)-> diff --git a/services/web/test/UnitTests/coffee/Editor/EditorRealTimeControllerTests.coffee b/services/web/test/UnitTests/coffee/Editor/EditorRealTimeControllerTests.coffee index 80b5800758..e4d174228d 100644 --- a/services/web/test/UnitTests/coffee/Editor/EditorRealTimeControllerTests.coffee +++ b/services/web/test/UnitTests/coffee/Editor/EditorRealTimeControllerTests.coffee @@ -9,7 +9,7 @@ describe "EditorRealTimeController", -> "redis-sharelatex": createClient: () -> auth:-> - createRobustSubscriptionClient: () -> + createMonitoredSubscriptionClient: () -> auth:-> "../../infrastructure/Server" : io: @io = {} @EditorRealTimeController.rclientPub = publish: sinon.stub() diff --git a/services/web/test/UnitTests/coffee/Editor/EditorUpdatesControllerTests.coffee b/services/web/test/UnitTests/coffee/Editor/EditorUpdatesControllerTests.coffee index ba39e921f1..1410e82473 100644 --- a/services/web/test/UnitTests/coffee/Editor/EditorUpdatesControllerTests.coffee +++ b/services/web/test/UnitTests/coffee/Editor/EditorUpdatesControllerTests.coffee @@ -18,7 +18,7 @@ describe "EditorUpdatesController", -> "../../infrastructure/Metrics" : @metrics = { set: sinon.stub(), inc: sinon.stub() } "../../infrastructure/Server" : io: @io = {} "redis-sharelatex" : - createRobustSubscriptionClient: ()=> + createMonitoredSubscriptionClient: ()=> @rclient = {auth:->} describe "_applyUpdate", -> From cd8c233c05f0ad4a98e9ad560792a3df92e4607c Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Wed, 19 Nov 2014 15:04:16 +0000 Subject: [PATCH 07/13] Revert robust redis connection code --- .../Features/Editor/EditorRealTimeController.coffee | 9 ++------- .../Features/Editor/EditorUpdatesController.coffee | 10 ++-------- services/web/app/coffee/router.coffee | 13 ------------- services/web/package.json | 2 +- .../Editor/EditorRealTimeControllerTests.coffee | 2 -- .../Editor/EditorUpdatesControllerTests.coffee | 2 +- 6 files changed, 6 insertions(+), 32 deletions(-) diff --git a/services/web/app/coffee/Features/Editor/EditorRealTimeController.coffee b/services/web/app/coffee/Features/Editor/EditorRealTimeController.coffee index b5c1f511a4..76f4f909c1 100644 --- a/services/web/app/coffee/Features/Editor/EditorRealTimeController.coffee +++ b/services/web/app/coffee/Features/Editor/EditorRealTimeController.coffee @@ -1,14 +1,11 @@ Settings = require 'settings-sharelatex' redis = require("redis-sharelatex") rclientPub = redis.createClient(Settings.redis.web) -rclientSub = redis.createMonitoredSubscriptionClient(Settings.redis.web) +rclientSub = redis.createClient(Settings.redis.web) module.exports = EditorRealTimeController = rclientPub: rclientPub rclientSub: rclientSub - - isRedisPubSubAlive: () -> - rclientSub.isAlive() emitToRoom: (room_id, message, payload...) -> @rclientPub.publish "editor-events", JSON.stringify @@ -21,9 +18,7 @@ module.exports = EditorRealTimeController = listenForEditorEvents: () -> @rclientSub.subscribe "editor-events" - @rclientSub.on "message", (channel, message) -> - return unless channel == "editor-events" - EditorRealTimeController._processEditorEvent(channel, message) + @rclientSub.on "message", @_processEditorEvent.bind(@) _processEditorEvent: (channel, message) -> io = require('../../infrastructure/Server').io diff --git a/services/web/app/coffee/Features/Editor/EditorUpdatesController.coffee b/services/web/app/coffee/Features/Editor/EditorUpdatesController.coffee index 23e206c504..0233c67aaa 100644 --- a/services/web/app/coffee/Features/Editor/EditorUpdatesController.coffee +++ b/services/web/app/coffee/Features/Editor/EditorUpdatesController.coffee @@ -2,11 +2,10 @@ logger = require "logger-sharelatex" metrics = require('../../infrastructure/Metrics') Settings = require 'settings-sharelatex' redis = require("redis-sharelatex") +rclient = redis.createClient(Settings.redis.web) DocumentUpdaterHandler = require('../DocumentUpdater/DocumentUpdaterHandler') EditorRealTimeController = require("./EditorRealTimeController") -rclient = redis.createMonitoredSubscriptionClient(Settings.redis.web) - module.exports = EditorUpdatesController = _applyUpdate: (client, project_id, doc_id, update, callback = (error) ->) -> metrics.inc "editor.doc-update", 0.3 @@ -29,14 +28,9 @@ module.exports = EditorUpdatesController = update.meta.user_id = user_id EditorUpdatesController._applyUpdate client, project_id, doc_id, update - isRedisPubSubAlive: () -> - rclient.isAlive() - listenForUpdatesFromDocumentUpdater: () -> rclient.subscribe "applied-ops" - rclient.on "message", (channel, message) -> - return unless channel == "applied-ops" - EditorUpdatesController._processMessageFromDocumentUpdater(channel, message) + rclient.on "message", @_processMessageFromDocumentUpdater.bind(@) _processMessageFromDocumentUpdater: (channel, message) -> message = JSON.parse message diff --git a/services/web/app/coffee/router.coffee b/services/web/app/coffee/router.coffee index ae5436cfd7..aaf81a8f16 100644 --- a/services/web/app/coffee/router.coffee +++ b/services/web/app/coffee/router.coffee @@ -8,7 +8,6 @@ AuthorizationManager = require('./Features/Security/AuthorizationManager') EditorController = require("./Features/Editor/EditorController") EditorRouter = require("./Features/Editor/EditorRouter") EditorUpdatesController = require("./Features/Editor/EditorUpdatesController") -EditorRealTimeController = require("./Features/Editor/EditorRealTimeController") Settings = require('settings-sharelatex') TpdsController = require('./Features/ThirdPartyDataStore/TpdsController') SubscriptionRouter = require './Features/Subscription/SubscriptionRouter' @@ -176,18 +175,6 @@ module.exports = class Router req.session.destroy() app.get '/health_check', HealthCheckController.check - - app.get '/health_check/redis/doc_updates', (req, res, next) -> - if EditorUpdatesController.isRedisPubSubAlive() - res.send(200) - else - res.send(500) - - app.get '/health_check/redis/websockets', (req, res, next) -> - if EditorRealTimeController.isRedisPubSubAlive() - res.send(200) - else - res.send(500) app.get "/status/compiler/:Project_id", SecurityManager.requestCanAccessProject, (req, res) -> sendRes = _.once (statusCode, message)-> diff --git a/services/web/package.json b/services/web/package.json index 6a67008720..9b43687fd0 100644 --- a/services/web/package.json +++ b/services/web/package.json @@ -31,7 +31,7 @@ "optimist": "0.6.1", "redback": "0.4.0", "redis": "0.10.1", - "redis-sharelatex": "git+https://github.com/sharelatex/redis-sharelatex.git#master", + "redis-sharelatex": "~0.0.4", "request": "2.34.0", "rimraf": "2.2.6", "sanitizer": "0.1.1", diff --git a/services/web/test/UnitTests/coffee/Editor/EditorRealTimeControllerTests.coffee b/services/web/test/UnitTests/coffee/Editor/EditorRealTimeControllerTests.coffee index e4d174228d..9bb1fb3a04 100644 --- a/services/web/test/UnitTests/coffee/Editor/EditorRealTimeControllerTests.coffee +++ b/services/web/test/UnitTests/coffee/Editor/EditorRealTimeControllerTests.coffee @@ -9,8 +9,6 @@ describe "EditorRealTimeController", -> "redis-sharelatex": createClient: () -> auth:-> - createMonitoredSubscriptionClient: () -> - auth:-> "../../infrastructure/Server" : io: @io = {} @EditorRealTimeController.rclientPub = publish: sinon.stub() @EditorRealTimeController.rclientSub = diff --git a/services/web/test/UnitTests/coffee/Editor/EditorUpdatesControllerTests.coffee b/services/web/test/UnitTests/coffee/Editor/EditorUpdatesControllerTests.coffee index 1410e82473..74d6807bb5 100644 --- a/services/web/test/UnitTests/coffee/Editor/EditorUpdatesControllerTests.coffee +++ b/services/web/test/UnitTests/coffee/Editor/EditorUpdatesControllerTests.coffee @@ -18,7 +18,7 @@ describe "EditorUpdatesController", -> "../../infrastructure/Metrics" : @metrics = { set: sinon.stub(), inc: sinon.stub() } "../../infrastructure/Server" : io: @io = {} "redis-sharelatex" : - createMonitoredSubscriptionClient: ()=> + createClient: ()=> @rclient = {auth:->} describe "_applyUpdate", -> From 9e63b6c3a16057ed4ff91c128ed5a5015edf47bb Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Wed, 19 Nov 2014 16:41:12 +0000 Subject: [PATCH 08/13] use redis 0.0.6 --- services/web/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/web/package.json b/services/web/package.json index 9b43687fd0..192d43649f 100644 --- a/services/web/package.json +++ b/services/web/package.json @@ -31,7 +31,7 @@ "optimist": "0.6.1", "redback": "0.4.0", "redis": "0.10.1", - "redis-sharelatex": "~0.0.4", + "redis-sharelatex": "~0.0.6", "request": "2.34.0", "rimraf": "2.2.6", "sanitizer": "0.1.1", From 57abc2cb241165309822a5139500bfa99eacbf17 Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Wed, 19 Nov 2014 16:45:10 +0000 Subject: [PATCH 09/13] lock down the version of redis --- services/web/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/web/package.json b/services/web/package.json index 192d43649f..7e529f1593 100644 --- a/services/web/package.json +++ b/services/web/package.json @@ -31,7 +31,7 @@ "optimist": "0.6.1", "redback": "0.4.0", "redis": "0.10.1", - "redis-sharelatex": "~0.0.6", + "redis-sharelatex": "0.0.6", "request": "2.34.0", "rimraf": "2.2.6", "sanitizer": "0.1.1", From 6c746d9aec93a3dba234789fa33b32418425e7c6 Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Wed, 19 Nov 2014 23:18:20 +0000 Subject: [PATCH 10/13] added redis health check in --- .../HealthCheck/HealthCheckController.coffee | 12 ++++++++++++ services/web/app/coffee/router.coffee | 1 + services/web/package.json | 2 +- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/services/web/app/coffee/Features/HealthCheck/HealthCheckController.coffee b/services/web/app/coffee/Features/HealthCheck/HealthCheckController.coffee index 066e32ede9..1924cc4338 100644 --- a/services/web/app/coffee/Features/HealthCheck/HealthCheckController.coffee +++ b/services/web/app/coffee/Features/HealthCheck/HealthCheckController.coffee @@ -1,5 +1,8 @@ Mocha = require "mocha" Base = require("mocha/lib/reporters/base") +redis = require("redis-sharelatex") +settings = require("settings-sharelatex") +redisCheck = redis.activeHealthCheckRedis(settings.redis.web) module.exports = HealthCheckController = check: (req, res, next = (error) ->) -> @@ -8,6 +11,15 @@ module.exports = HealthCheckController = mocha.run () -> path = require.resolve(__dirname + "/../../../../test/smoke/js/SmokeTests.js") delete require.cache[path] + + checkRedis: (req, res, next)-> + if redisCheck.isAlive() + res.send 200 + else + res.send 500 + + + Reporter = (res) -> (runner) -> diff --git a/services/web/app/coffee/router.coffee b/services/web/app/coffee/router.coffee index aaf81a8f16..a80f215cb8 100644 --- a/services/web/app/coffee/router.coffee +++ b/services/web/app/coffee/router.coffee @@ -175,6 +175,7 @@ module.exports = class Router req.session.destroy() app.get '/health_check', HealthCheckController.check + app.get '/health_check/redis', HealthCheckController.checkRedis app.get "/status/compiler/:Project_id", SecurityManager.requestCanAccessProject, (req, res) -> sendRes = _.once (statusCode, message)-> diff --git a/services/web/package.json b/services/web/package.json index 7e529f1593..bb751799e8 100644 --- a/services/web/package.json +++ b/services/web/package.json @@ -31,7 +31,7 @@ "optimist": "0.6.1", "redback": "0.4.0", "redis": "0.10.1", - "redis-sharelatex": "0.0.6", + "redis-sharelatex": "0.0.7", "request": "2.34.0", "rimraf": "2.2.6", "sanitizer": "0.1.1", From 851764f2690109bc999a29f9ef53c99c86d14011 Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Thu, 20 Nov 2014 11:10:22 +0000 Subject: [PATCH 11/13] bump package.json --- services/web/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/web/package.json b/services/web/package.json index bb751799e8..d8345514ce 100644 --- a/services/web/package.json +++ b/services/web/package.json @@ -31,7 +31,7 @@ "optimist": "0.6.1", "redback": "0.4.0", "redis": "0.10.1", - "redis-sharelatex": "0.0.7", + "redis-sharelatex": "0.0.8", "request": "2.34.0", "rimraf": "2.2.6", "sanitizer": "0.1.1", From 24b3226fcf9bf10073903a1b3a610a18ced4f4be Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Thu, 20 Nov 2014 12:50:55 +0000 Subject: [PATCH 12/13] bump redis version --- services/web/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/web/package.json b/services/web/package.json index d8345514ce..08ef2aadd1 100644 --- a/services/web/package.json +++ b/services/web/package.json @@ -31,7 +31,7 @@ "optimist": "0.6.1", "redback": "0.4.0", "redis": "0.10.1", - "redis-sharelatex": "0.0.8", + "redis-sharelatex": "0.0.9", "request": "2.34.0", "rimraf": "2.2.6", "sanitizer": "0.1.1", From 485459c8399d56e516290523b69a99e0d319f8a2 Mon Sep 17 00:00:00 2001 From: James Allen Date: Fri, 21 Nov 2014 12:44:41 +0000 Subject: [PATCH 13/13] Use real-time server for websockets --- services/web/config/settings.defaults.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/web/config/settings.defaults.coffee b/services/web/config/settings.defaults.coffee index 2c191e67f6..07ae5b6357 100644 --- a/services/web/config/settings.defaults.coffee +++ b/services/web/config/settings.defaults.coffee @@ -110,7 +110,7 @@ module.exports = # then websocketsUrl should be the same as siteUrl, with your reverse # proxy responible for sending websocket traffic to the websocket service # rather than connecting directly. - websocketsUrl: "http://localhost:3000" + websocketsUrl: "http://localhost:3026" # Where your instance of ShareLaTeX can be found publically. Used in emails # that are sent out, generated links, etc.