v1 of sentinal support

This commit is contained in:
Henry Oswald 2014-09-26 14:52:00 +01:00
parent ab46d6ec1a
commit f73629f8d9
9 changed files with 44 additions and 49 deletions

View file

@ -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"

View file

@ -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

View file

@ -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')

View file

@ -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) ->) ->

View file

@ -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")

View file

@ -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}"

View file

@ -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')

View file

@ -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 =

View file

@ -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",
"logger-sharelatex": "git+https://github.com/sharelatex/logger-sharelatex.git#v1.0.0",
"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",
"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",
"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": "",