mirror of
https://github.com/yu-i-i/overleaf-cep.git
synced 2026-11-15 14:43:46 +01:00
revert the removal of realtime keyspace
This commit is contained in:
@@ -10,7 +10,7 @@ RateLimitManager = require('./RateLimitManager')
|
|||||||
|
|
||||||
module.exports = DispatchManager =
|
module.exports = DispatchManager =
|
||||||
createDispatcher: (RateLimiter) ->
|
createDispatcher: (RateLimiter) ->
|
||||||
client = redis.createClient(Settings.redis.documentupdater)
|
client = redis.createClient(Settings.redis.realtime)
|
||||||
worker = {
|
worker = {
|
||||||
client: client
|
client: client
|
||||||
_waitForUpdateThenDispatchWorker: (callback = (error) ->) ->
|
_waitForUpdateThenDispatchWorker: (callback = (error) ->) ->
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
Settings = require('settings-sharelatex')
|
Settings = require('settings-sharelatex')
|
||||||
rclient = require("redis-sharelatex").createClient(Settings.redis.documentupdater)
|
rclient = require("redis-sharelatex").createClient(Settings.redis.realtime)
|
||||||
Keys = Settings.redis.documentupdater.key_schema
|
Keys = Settings.redis.realtime.key_schema
|
||||||
logger = require('logger-sharelatex')
|
logger = require('logger-sharelatex')
|
||||||
|
|
||||||
MAX_OPS_PER_ITERATION = 8 # process a limited number of ops for safety
|
MAX_OPS_PER_ITERATION = 8 # process a limited number of ops for safety
|
||||||
|
|||||||
@@ -21,6 +21,15 @@ module.exports =
|
|||||||
|
|
||||||
redis:
|
redis:
|
||||||
|
|
||||||
|
realtime:
|
||||||
|
port: process.env["REAL_TIME_REDIS_PORT"] or process.env["REDIS_PORT"] or "6379"
|
||||||
|
host: process.env["REAL_TIME_REDIS_HOST"] or process.env["REDIS_HOST"] or "localhost"
|
||||||
|
password: process.env["REAL_TIME_REDIS_PASSWORD"] or process.env["REDIS_PASSWORD"] or ""
|
||||||
|
redisOptions:
|
||||||
|
keepAlive: 100
|
||||||
|
key_schema:
|
||||||
|
pendingUpdates: ({doc_id}) -> "PendingUpdates:#{doc_id}"
|
||||||
|
|
||||||
history:
|
history:
|
||||||
port: process.env["HISTORY_REDIS_PORT"] or process.env["REDIS_PORT"] or "6379"
|
port: process.env["HISTORY_REDIS_PORT"] or process.env["REDIS_PORT"] or "6379"
|
||||||
host: process.env["HISTORY_REDIS_HOST"] or process.env["REDIS_HOST"] or "localhost"
|
host: process.env["HISTORY_REDIS_HOST"] or process.env["REDIS_HOST"] or "localhost"
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
Settings = require('settings-sharelatex')
|
Settings = require('settings-sharelatex')
|
||||||
rclient = require("redis-sharelatex").createClient(Settings.redis.documentupdater)
|
rclient = require("redis-sharelatex").createClient(Settings.redis.realtime)
|
||||||
keys = Settings.redis.documentupdater.key_schema
|
keys = Settings.redis.realtime.key_schema
|
||||||
request = require("request").defaults(jar: false)
|
request = require("request").defaults(jar: false)
|
||||||
async = require "async"
|
async = require "async"
|
||||||
|
|
||||||
rclient_sub = require("redis-sharelatex").createClient(Settings.redis.documentupdater)
|
rclient_sub = require("redis-sharelatex").createClient(Settings.redis.realtime)
|
||||||
rclient_sub.subscribe "applied-ops"
|
rclient_sub.subscribe "applied-ops"
|
||||||
rclient_sub.setMaxListeners(0)
|
rclient_sub.setMaxListeners(0)
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -13,7 +13,7 @@ describe "DispatchManager", ->
|
|||||||
"logger-sharelatex": @logger = { log: sinon.stub() }
|
"logger-sharelatex": @logger = { log: sinon.stub() }
|
||||||
"settings-sharelatex": @settings =
|
"settings-sharelatex": @settings =
|
||||||
redis:
|
redis:
|
||||||
documentupdater: {}
|
realtime: {}
|
||||||
"redis-sharelatex": @redis = {}
|
"redis-sharelatex": @redis = {}
|
||||||
"./RateLimitManager": {}
|
"./RateLimitManager": {}
|
||||||
"./Metrics":
|
"./Metrics":
|
||||||
|
|||||||
+1
-1
@@ -15,7 +15,7 @@ describe "RealTimeRedisManager", ->
|
|||||||
"redis-sharelatex": createClient: () => @rclient
|
"redis-sharelatex": createClient: () => @rclient
|
||||||
"settings-sharelatex":
|
"settings-sharelatex":
|
||||||
redis:
|
redis:
|
||||||
documentupdater: @settings =
|
realtime: @settings =
|
||||||
key_schema:
|
key_schema:
|
||||||
pendingUpdates: ({doc_id}) -> "PendingUpdates:#{doc_id}"
|
pendingUpdates: ({doc_id}) -> "PendingUpdates:#{doc_id}"
|
||||||
"logger-sharelatex": { log: () -> }
|
"logger-sharelatex": { log: () -> }
|
||||||
|
|||||||
Reference in New Issue
Block a user