From dd22f1f7a1c55480c11782491fd3aab0f215305a Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Mon, 3 Mar 2014 11:46:40 +0000 Subject: [PATCH] added redis connection settings into rate limiter --- .../app/coffee/infrastructure/RateLimiter.coffee | 6 +++++- .../coffee/infrastructure/RateLimterTests.coffee | 13 +++++++++++-- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/services/web/app/coffee/infrastructure/RateLimiter.coffee b/services/web/app/coffee/infrastructure/RateLimiter.coffee index 2860e70656..fc30cec744 100644 --- a/services/web/app/coffee/infrastructure/RateLimiter.coffee +++ b/services/web/app/coffee/infrastructure/RateLimiter.coffee @@ -1,4 +1,8 @@ -redback = require("redback").createClient() +settings = require("settings-sharelatex") +redis = require('redis') +rclient = redis.createClient(settings.redis.web.port, settings.redis.web.host) +rclient.auth(settings.redis.web.password) +redback = require("redback").use(rclient) module.exports = diff --git a/services/web/test/UnitTests/coffee/infrastructure/RateLimterTests.coffee b/services/web/test/UnitTests/coffee/infrastructure/RateLimterTests.coffee index e513c11cdf..adbedd8c86 100644 --- a/services/web/test/UnitTests/coffee/infrastructure/RateLimterTests.coffee +++ b/services/web/test/UnitTests/coffee/infrastructure/RateLimterTests.coffee @@ -9,17 +9,26 @@ SandboxedModule = require('sandboxed-module') describe "FileStoreHandler", -> beforeEach -> - @settings = apis:{filestore:{url:"http//filestore.sharelatex.test"}} + @settings = + redis: + web: + port:"1234" + host:"somewhere" + password: "password" @redbackInstance = addCount: sinon.stub() @redback = createRateLimit: sinon.stub().returns(@redbackInstance) + @redis = + createClient: -> + return auth:-> @limiter = SandboxedModule.require modulePath, requires: "settings-sharelatex":@settings "logger-sharelatex" : @logger = {log:sinon.stub(), err:sinon.stub()} - "redback": createClient: => @redback + "redis": @redis + "redback": use: => @redback @endpointName = "compiles" @subject = "some project id"