agw/overleaf-cep
1
0
Fork 0
mirror of https://github.com/yu-i-i/overleaf-cep.git synced 2026-11-14 14:13:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "turn down logging, use logger.info for less important data"

Browse Source 
This reverts commit c5f91428e3c7702fbbd3ffd1ef7a772d513f33f2.
This commit is contained in:
Henry Oswald
2019-02-06 15:29:22 +00:00
parent 8d3fb729c5
commit 4e1a2c787c
14 changed files with 27 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/document-updater/app/coffee/DocumentManager.coffee
+1 -1
View File
@@ -25,7 +25,7 @@ module.exports = DocumentManager =
logger.log {project_id, doc_id}, "doc not in redis so getting from persistence API"
PersistenceManager.getDoc project_id, doc_id, (error, lines, version, ranges, pathname, projectHistoryId) ->
return callback(error) if error?
logger.info {project_id, doc_id, lines, version, pathname, projectHistoryId}, "got doc from persistence API"
logger.log {project_id, doc_id, lines, version, pathname, projectHistoryId}, "got doc from persistence API"
RedisManager.putDocInMemory project_id, doc_id, lines, version, ranges, pathname, projectHistoryId, (error) ->
return callback(error) if error?
callback null, lines, version, ranges, pathname, projectHistoryId, null, false
services/document-updater/app/coffee/HistoryRedisManager.coffee
+1 -1
View File
@@ -7,7 +7,7 @@ module.exports = HistoryRedisManager =
recordDocHasHistoryOps: (project_id, doc_id, ops = [], callback = (error) ->) ->
if ops.length == 0
return callback(new Error("cannot push no ops")) # This should never be called with no ops, but protect against a redis error if we sent an empty array to rpush
logger.info project_id: project_id, doc_id: doc_id, "marking doc in project for history ops"
logger.log project_id: project_id, doc_id: doc_id, "marking doc in project for history ops"
rclient.sadd Keys.docsWithHistoryOps({project_id}), doc_id, (error) ->
return callback(error) if error?
callback()
services/document-updater/app/coffee/HttpController.coffee
+4 -4
View File
@@ -11,7 +11,7 @@ module.exports = HttpController =
getDoc: (req, res, next = (error) ->) ->
doc_id = req.params.doc_id
project_id = req.params.project_id
logger.info project_id: project_id, doc_id: doc_id, "getting doc via http"
logger.log project_id: project_id, doc_id: doc_id, "getting doc via http"
timer = new Metrics.Timer("http.getDoc")
if req.query?.fromVersion?
@@ -22,7 +22,7 @@ module.exports = HttpController =
DocumentManager.getDocAndRecentOpsWithLock project_id, doc_id, fromVersion, (error, lines, version, ops, ranges, pathname) ->
timer.done()
return next(error) if error?
logger.info project_id: project_id, doc_id: doc_id, "got doc via http"
logger.log project_id: project_id, doc_id: doc_id, "got doc via http"
if !lines? or !version?
return next(new Errors.NotFoundError("document not found"))
res.send JSON.stringify
@@ -44,13 +44,13 @@ module.exports = HttpController =
projectStateHash = req.query?.state
# exclude is string of existing docs "id:version,id:version,..."
excludeItems = req.query?.exclude?.split(',') or []
logger.info project_id: project_id, exclude: excludeItems, "getting docs via http"
logger.log project_id: project_id, exclude: excludeItems, "getting docs via http"
timer = new Metrics.Timer("http.getAllDocs")
excludeVersions = {}
for item in excludeItems
[id,version] = item?.split(':')
excludeVersions[id] = version
logger.info {project_id: project_id, projectStateHash: projectStateHash, excludeVersions: excludeVersions}, "excluding versions"
logger.log {project_id: project_id, projectStateHash: projectStateHash, excludeVersions: excludeVersions}, "excluding versions"
ProjectManager.getProjectDocsAndFlushIfOld project_id, projectStateHash, excludeVersions, (error, result) ->
timer.done()
if error instanceof Errors.ProjectStateChangedError
services/document-updater/app/coffee/RangesManager.coffee
+3 -3
View File
@@ -30,12 +30,12 @@ module.exports = RangesManager =
return callback(error)
response = RangesManager._getRanges rangesTracker
logger.info {project_id, doc_id, changesCount: response.changes?.length, commentsCount: response.comments?.length}, "applied updates to ranges"
logger.log {project_id, doc_id, changesCount: response.changes?.length, commentsCount: response.comments?.length}, "applied updates to ranges"
callback null, response
acceptChanges: (change_ids, ranges, callback = (error, ranges) ->) ->
{changes, comments} = ranges
logger.info "accepting #{ change_ids.length } changes in ranges"
logger.log "accepting #{ change_ids.length } changes in ranges"
rangesTracker = new RangesTracker(changes, comments)
rangesTracker.removeChangeIds(change_ids)
response = RangesManager._getRanges(rangesTracker)
@@ -43,7 +43,7 @@ module.exports = RangesManager =
deleteComment: (comment_id, ranges, callback = (error, ranges) ->) ->
{changes, comments} = ranges
logger.info {comment_id}, "deleting comment in ranges"
logger.log {comment_id}, "deleting comment in ranges"
rangesTracker = new RangesTracker(changes, comments)
rangesTracker.removeCommentId(comment_id)
response = RangesManager._getRanges(rangesTracker)
services/document-updater/app/coffee/RedisManager.coffee
+1 -1
View File
@@ -233,7 +233,7 @@ module.exports = RedisManager =
newHash = RedisManager._computeHash(newDocLines)
opVersions = appliedOps.map (op) -> op?.v
logger.info doc_id: doc_id, version: newVersion, hash: newHash, op_versions: opVersions, "updating doc in redis"
logger.log doc_id: doc_id, version: newVersion, hash: newHash, op_versions: opVersions, "updating doc in redis"
RedisManager._serializeRanges ranges, (error, ranges) ->
if error?
services/document-updater/app/coffee/ShareJsUpdateManager.coffee
+2 -2
View File
@@ -20,7 +20,7 @@ module.exports = ShareJsUpdateManager =
return model
applyUpdate: (project_id, doc_id, update, lines, version, callback = (error, updatedDocLines) ->) ->
logger.info project_id: project_id, doc_id: doc_id, update: update, "applying sharejs updates"
logger.log project_id: project_id, doc_id: doc_id, update: update, "applying sharejs updates"
jobs = []
# We could use a global model for all docs, but we're hitting issues with the
@@ -39,7 +39,7 @@ module.exports = ShareJsUpdateManager =
ShareJsUpdateManager._sendOp(project_id, doc_id, update)
else
return callback(error)
logger.info project_id: project_id, doc_id: doc_id, error: error, "applied update"
logger.log project_id: project_id, doc_id: doc_id, error: error, "applied update"
model.getSnapshot doc_key, (error, data) =>
return callback(error) if error?
docLines = data.snapshot.split(/\r\n|\n|\r/)
services/document-updater/app/coffee/UpdateManager.coffee
+1 -1
View File
@@ -47,7 +47,7 @@ module.exports = UpdateManager =
profile = new Profiler("fetchAndApplyUpdates", {project_id, doc_id})
RealTimeRedisManager.getPendingUpdatesForDoc doc_id, (error, updates) =>
return callback(error) if error?
logger.info {project_id: project_id, doc_id: doc_id, count: updates.length}, "processing updates"
logger.log {project_id: project_id, doc_id: doc_id, count: updates.length}, "processing updates"
if updates.length == 0
return callback()
profile.log("getPendingUpdatesForDoc")