github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-21 20:47:08 -05:00
Code Issues Projects Releases Packages Wiki Activity

remove new_project_history and use project_history instead

Browse source
This commit is contained in:
Brian Gough 2020-04-21 14:43:48 +01:00
parent 8e210fe441
commit af93193d6e
3 changed files with 1 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
services/document-updater/app/coffee/ProjectHistoryRedisManager.coffee
View file

@ -1,7 +1,6 @@
Settings = require('settings-sharelatex') Settings = require('settings-sharelatex')
projectHistoryKeys = Settings.redis?.project_history?.key_schema projectHistoryKeys = Settings.redis?.project_history?.key_schema
#rclient = require("redis-sharelatex").createClient(Settings.redis.project_history) rclient = require("redis-sharelatex").createClient(Settings.redis.project_history)
rclient = require("./RedisMigrationManager").createClient(Settings.redis.project_history, Settings.redis.new_project_history)
logger = require('logger-sharelatex') logger = require('logger-sharelatex')
metrics = require('./Metrics') metrics = require('./Metrics')

11
services/document-updater/config/settings.defaults.coffee
View file

@ -37,23 +37,12 @@ module.exports =
docsWithHistoryOps: ({project_id}) -> "DocsWithHistoryOps:{#{project_id}}" docsWithHistoryOps: ({project_id}) -> "DocsWithHistoryOps:{#{project_id}}"
project_history: project_history:
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"
password: process.env["HISTORY_REDIS_PASSWORD"] or process.env["REDIS_PASSWORD"] or ""
maxRetriesPerRequest: parseInt(process.env['REDIS_MAX_RETRIES_PER_REQUEST'] or "20")
key_schema:
projectHistoryOps: ({project_id}) -> "ProjectHistory:Ops:{#{project_id}}"
projectHistoryFirstOpTimestamp: ({project_id}) -> "ProjectHistory:FirstOpTimestamp:{#{project_id}}"
new_project_history:
port: process.env["NEW_HISTORY_REDIS_PORT"] or "6379" port: process.env["NEW_HISTORY_REDIS_PORT"] or "6379"
host: process.env["NEW_HISTORY_REDIS_HOST"] host: process.env["NEW_HISTORY_REDIS_HOST"]
password: process.env["NEW_HISTORY_REDIS_PASSWORD"] or "" password: process.env["NEW_HISTORY_REDIS_PASSWORD"] or ""
key_schema: key_schema:
projectHistoryOps: ({project_id}) -> "ProjectHistory:Ops:{#{project_id}}" projectHistoryOps: ({project_id}) -> "ProjectHistory:Ops:{#{project_id}}"
projectHistoryFirstOpTimestamp: ({project_id}) -> "ProjectHistory:FirstOpTimestamp:{#{project_id}}" projectHistoryFirstOpTimestamp: ({project_id}) -> "ProjectHistory:FirstOpTimestamp:{#{project_id}}"
projectHistoryMigrationKey: ({project_id}) -> "ProjectHistory:MigrationKey:{#{project_id}}"
migration_phase: process.env["PROJECT_HISTORY_MIGRATION_PHASE"] or "prepare"
redisOptions: redisOptions:
keepAlive: 100 keepAlive: 100

2
services/document-updater/test/unit/coffee/ProjectHistoryRedisManager/ProjectHistoryRedisManagerTests.coffee
View file

@ -24,8 +24,6 @@ describe "ProjectHistoryRedisManager", ->
} }
"redis-sharelatex": "redis-sharelatex":
createClient: () => @rclient createClient: () => @rclient
"./RedisMigrationManager":
createClient: () => @rclient
"logger-sharelatex": "logger-sharelatex":
log:-> log:->
"./Metrics": @metrics = { summary: sinon.stub()} "./Metrics": @metrics = { summary: sinon.stub()}