From 6e97521971a38c262de7011043699c893b8623e1 Mon Sep 17 00:00:00 2001 From: Brian Gough Date: Tue, 1 Dec 2015 15:58:40 +0000 Subject: [PATCH] Revert "Merge pull request #4 from sharelatex/flush-ops-from-redis" This reverts commit 84a9ad8b67b860a92271cf7bb669cf21cc0b5b86, reversing changes made to a6d4649f4f2db06862e8cbc5e132a073ce8c20b2. --- services/document-updater/app/coffee/DocumentManager.coffee | 5 +---- .../coffee/DocumentManager/flushAndDeleteDocTests.coffee | 1 - .../test/unit/coffee/DocumentManager/flushDocTests.coffee | 2 -- .../coffee/DocumentManager/getDocAndRecentOpsTests.coffee | 1 - .../test/unit/coffee/DocumentManager/getDocTests.coffee | 1 - .../test/unit/coffee/DocumentManager/setDocTests.coffee | 1 - 6 files changed, 1 insertion(+), 10 deletions(-) diff --git a/services/document-updater/app/coffee/DocumentManager.coffee b/services/document-updater/app/coffee/DocumentManager.coffee index 81fa0aa66c..0faa8d2b8a 100644 --- a/services/document-updater/app/coffee/DocumentManager.coffee +++ b/services/document-updater/app/coffee/DocumentManager.coffee @@ -4,7 +4,6 @@ DocOpsManager = require "./DocOpsManager" DiffCodec = require "./DiffCodec" logger = require "logger-sharelatex" Metrics = require "./Metrics" -TrackChangesManager = require "./TrackChangesManager" module.exports = DocumentManager = getDoc: (project_id, doc_id, _callback = (error, lines, version) ->) -> @@ -91,9 +90,7 @@ module.exports = DocumentManager = logger.log project_id: project_id, doc_id: doc_id, version: version, "flushing doc" PersistenceManager.setDoc project_id, doc_id, lines, version, (error) -> return callback(error) if error? - TrackChangesManager.flushDocChanges project_id, doc_id, (error) -> - return callback(error) if error? - callback null + callback null flushAndDeleteDoc: (project_id, doc_id, _callback = (error) ->) -> timer = new Metrics.Timer("docManager.flushAndDeleteDoc") diff --git a/services/document-updater/test/unit/coffee/DocumentManager/flushAndDeleteDocTests.coffee b/services/document-updater/test/unit/coffee/DocumentManager/flushAndDeleteDocTests.coffee index c4a6ef3d1a..85a25ee5a7 100644 --- a/services/document-updater/test/unit/coffee/DocumentManager/flushAndDeleteDocTests.coffee +++ b/services/document-updater/test/unit/coffee/DocumentManager/flushAndDeleteDocTests.coffee @@ -8,7 +8,6 @@ describe "DocumentUpdater - flushAndDeleteDoc", -> beforeEach -> @DocumentManager = SandboxedModule.require modulePath, requires: "./RedisManager": @RedisManager = {} - "./TrackChangesManager": @TrackChangesManager = {} "./PersistenceManager": @PersistenceManager = {} "logger-sharelatex": @logger = {log: sinon.stub()} "./DocOpsManager" :{} diff --git a/services/document-updater/test/unit/coffee/DocumentManager/flushDocTests.coffee b/services/document-updater/test/unit/coffee/DocumentManager/flushDocTests.coffee index 551b444f7f..6bdba1a2b7 100644 --- a/services/document-updater/test/unit/coffee/DocumentManager/flushDocTests.coffee +++ b/services/document-updater/test/unit/coffee/DocumentManager/flushDocTests.coffee @@ -8,7 +8,6 @@ describe "DocumentUpdater - flushDocIfLoaded", -> beforeEach -> @DocumentManager = SandboxedModule.require modulePath, requires: "./RedisManager": @RedisManager = {} - "./TrackChangesManager": @TrackChangesManager = {} "./PersistenceManager": @PersistenceManager = {} "./DocOpsManager": @DocOpsManager = {} "logger-sharelatex": @logger = {log: sinon.stub()} @@ -24,7 +23,6 @@ describe "DocumentUpdater - flushDocIfLoaded", -> describe "when the doc is in Redis", -> beforeEach -> @RedisManager.getDoc = sinon.stub().callsArgWith(1, null, @lines, @version) - @TrackChangesManager.flushDocChanges = sinon.stub().callsArg(2) @PersistenceManager.setDoc = sinon.stub().callsArgWith(4) @DocumentManager.flushDocIfLoaded @project_id, @doc_id, @callback diff --git a/services/document-updater/test/unit/coffee/DocumentManager/getDocAndRecentOpsTests.coffee b/services/document-updater/test/unit/coffee/DocumentManager/getDocAndRecentOpsTests.coffee index 1e5f521b36..7a296cc47d 100644 --- a/services/document-updater/test/unit/coffee/DocumentManager/getDocAndRecentOpsTests.coffee +++ b/services/document-updater/test/unit/coffee/DocumentManager/getDocAndRecentOpsTests.coffee @@ -8,7 +8,6 @@ describe "DocumentUpdater - getDocAndRecentOps", -> beforeEach -> @DocumentManager = SandboxedModule.require modulePath, requires: "./RedisManager": @RedisManager = {} - "./TrackChangesManager": @TrackChangesManager = {} "./PersistenceManager": @PersistenceManager = {} "./DocOpsManager": @DocOpsManager = {} "logger-sharelatex": @logger = {log: sinon.stub()} diff --git a/services/document-updater/test/unit/coffee/DocumentManager/getDocTests.coffee b/services/document-updater/test/unit/coffee/DocumentManager/getDocTests.coffee index 9d95d46a87..ea68890199 100644 --- a/services/document-updater/test/unit/coffee/DocumentManager/getDocTests.coffee +++ b/services/document-updater/test/unit/coffee/DocumentManager/getDocTests.coffee @@ -8,7 +8,6 @@ describe "DocumentUpdater - getDoc", -> beforeEach -> @DocumentManager = SandboxedModule.require modulePath, requires: "./RedisManager": @RedisManager = {} - "./TrackChangesManager": @TrackChangesManager = {} "./PersistenceManager": @PersistenceManager = {} "./DocOpsManager": @DocOpsManager = {} "logger-sharelatex": @logger = {log: sinon.stub()} diff --git a/services/document-updater/test/unit/coffee/DocumentManager/setDocTests.coffee b/services/document-updater/test/unit/coffee/DocumentManager/setDocTests.coffee index a1667a6669..b827b584f8 100644 --- a/services/document-updater/test/unit/coffee/DocumentManager/setDocTests.coffee +++ b/services/document-updater/test/unit/coffee/DocumentManager/setDocTests.coffee @@ -8,7 +8,6 @@ describe "DocumentManager - setDoc", -> beforeEach -> @DocumentManager = SandboxedModule.require modulePath, requires: "./RedisManager": @RedisManager = {} - "./TrackChangesManager": @TrackChangesManager = {} "./PersistenceManager": @PersistenceManager = {} "./DiffCodec": @DiffCodec = {} "./DocOpsManager":{}