github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2025-01-24 02:51:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'sk-upgrade-metrics'

Browse source
This commit is contained in:
Shane Kilkelly 2017-04-04 16:16:37 +01:00
commit 96f5802462
10 changed files with 921 additions and 1273 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
services/track-changes/app.coffee
View file

@ -25,7 +25,6 @@ TrackChangesLogger.addSerializers {
Path = require "path"
Metrics = require "metrics-sharelatex"
Metrics.initialize("track-changes")
Metrics.mongodb.monitor(Path.resolve(__dirname + "/node_modules/mongojs/node_modules/mongodb"), logger)
Metrics.memory.monitor(logger)
child_process = require "child_process"

1
services/track-changes/app/coffee/Metrics.coffee
View file

@ -1 +0,0 @@
module.exports = require "metrics-sharelatex"

2
services/track-changes/app/coffee/MongoAWS.coffee
View file

@ -6,7 +6,7 @@ S3S = require 's3-streams'
JSONStream = require "JSONStream"
ReadlineStream = require "byline"
zlib = require "zlib"
Metrics = require "./Metrics"
Metrics = require "metrics-sharelatex"
DAYS = 24 * 3600 * 1000 # one day in milliseconds

10
services/track-changes/app/coffee/MongoManager.coffee
View file

@ -2,6 +2,8 @@
PackManager = require "./PackManager"
async = require "async"
_ = require "underscore"
metrics = require 'metrics-sharelatex'
logger = require 'logger-sharelatex'
module.exports = MongoManager =
getLastCompressedUpdate: (doc_id, callback = (error, update) ->) ->
@ -92,3 +94,11 @@ module.exports = MongoManager =
db.docHistory.ensureIndex { last_checked: 1 }, { background: true }
# For finding archived packs
db.docHistoryIndex.ensureIndex { project_id: 1 }, { background: true }
[
'getLastCompressedUpdate',
'getProjectMetaData',
'setProjectMetaData'
].map (method) ->
metrics.timeAsyncMethod(MongoManager, method, 'mongo.MongoManager', logger)

2
services/track-changes/app/coffee/PackManager.coffee
View file

@ -4,7 +4,7 @@ _ = require "underscore"
logger = require "logger-sharelatex"
LockManager = require "./LockManager"
MongoAWS = require "./MongoAWS"
Metrics = require "./Metrics"
Metrics = require "metrics-sharelatex"
ProjectIterator = require "./ProjectIterator"
# Sharejs operations are stored in a 'pack' object

2172
services/track-changes/npm-shrinkwrap.json generated
View file

File diff suppressed because it is too large Load diff

2
services/track-changes/package.json
View file

@ -16,7 +16,7 @@
"mongojs": "^1.4.1",
"settings-sharelatex": "git+https://github.com/sharelatex/settings-sharelatex.git#v1.0.0",
"logger-sharelatex": "git+https://github.com/sharelatex/logger-sharelatex.git#v1.5.6",
"metrics-sharelatex": "git+https://github.com/sharelatex/metrics-sharelatex.git#v1.5.0",
"metrics-sharelatex": "git+https://github.com/sharelatex/metrics-sharelatex.git#v1.7.1",
"request": "~2.33.0",
"requestretry": "^1.12.0",
"redis-sharelatex": "~0.0.9",

1
services/track-changes/test/unit/coffee/DocArchive/MongoAWS.coffee
View file

@ -26,6 +26,7 @@ describe "MongoAWS", ->
"./mongojs" : { db: @db = {}, ObjectId: ObjectId }
"JSONStream": @JSONStream = {}
"readline-stream": @readline = sinon.stub()
'metrics-sharelatex': {inc: ()->}
@project_id = ObjectId().toString()
@doc_id = ObjectId().toString()

2
services/track-changes/test/unit/coffee/MongoManager/MongoManagerTests.coffee
View file

@ -14,6 +14,8 @@ describe "MongoManager", ->
@MongoManager = SandboxedModule.require modulePath, requires:
"./mongojs" : { db: @db = {}, ObjectId: ObjectId }
"./PackManager" : @PackManager = {}
'metrics-sharelatex': {timeAsyncMethod: ()->}
'logger-sharelatex': {log: ()->}
@callback = sinon.stub()
@doc_id = ObjectId().toString()
@project_id = ObjectId().toString()

1
services/track-changes/test/unit/coffee/PackManager/PackManagerTests.coffee
View file

@ -20,6 +20,7 @@ describe "PackManager", ->
"./LockManager" : {}
"./MongoAWS": {}
"logger-sharelatex": { log: sinon.stub(), error: sinon.stub() }
'metrics-sharelatex': {inc: ()->}
@callback = sinon.stub()
@doc_id = ObjectId().toString()
@project_id = ObjectId().toString()