From a7945e9b960e9822b25499b26dd2a37c8d951447 Mon Sep 17 00:00:00 2001 From: Hayden Faulds Date: Fri, 9 Mar 2018 11:05:17 +0000 Subject: [PATCH] extra logging for DocumentUpdaterHandler --- services/web/app.coffee | 2 ++ .../DocumentUpdaterHandler.coffee | 3 ++- .../infrastructure/LoggerSerializers.coffee | 16 +++++++++++++++- 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/services/web/app.coffee b/services/web/app.coffee index d8590689b3..5eb36f6439 100644 --- a/services/web/app.coffee +++ b/services/web/app.coffee @@ -2,6 +2,8 @@ Settings = require('settings-sharelatex') logger = require 'logger-sharelatex' logger.initialize("web-sharelatex") logger.logger.serializers.user = require("./app/js/infrastructure/LoggerSerializers").user +logger.logger.serializers.docs = require("./app/js/infrastructure/LoggerSerializers").docs +logger.logger.serializers.files = require("./app/js/infrastructure/LoggerSerializers").files logger.logger.serializers.project = require("./app/js/infrastructure/LoggerSerializers").project if Settings.sentry?.dsn? logger.initializeErrorReporting(Settings.sentry.dsn) diff --git a/services/web/app/coffee/Features/DocumentUpdater/DocumentUpdaterHandler.coffee b/services/web/app/coffee/Features/DocumentUpdater/DocumentUpdaterHandler.coffee index c9e51484f9..e340187dbb 100644 --- a/services/web/app/coffee/Features/DocumentUpdater/DocumentUpdaterHandler.coffee +++ b/services/web/app/coffee/Features/DocumentUpdater/DocumentUpdaterHandler.coffee @@ -122,7 +122,7 @@ module.exports = DocumentUpdaterHandler = }, project_id, "delete-thread", callback resyncProjectHistory: (project_id, docs, files, callback) -> - logger.info {project_id}, "resyncing project in doc updater" + logger.info {project_id, docs, files}, "resyncing project history in doc updater" DocumentUpdaterHandler._makeRequest { path: "/project/#{project_id}/history/resync" json: { docs, files } @@ -141,6 +141,7 @@ module.exports = DocumentUpdaterHandler = return callback() if (docUpdates.length + fileUpdates.length) < 1 + logger.log {project_id}, "updating project structure in doc updater" DocumentUpdaterHandler._makeRequest { path: "/project/#{project_id}" json: { docUpdates, fileUpdates, userId, version: currentProject.version } diff --git a/services/web/app/coffee/infrastructure/LoggerSerializers.coffee b/services/web/app/coffee/infrastructure/LoggerSerializers.coffee index 7bd90c3bf5..c45f0f0bb8 100644 --- a/services/web/app/coffee/infrastructure/LoggerSerializers.coffee +++ b/services/web/app/coffee/infrastructure/LoggerSerializers.coffee @@ -10,7 +10,7 @@ module.exports = first_name: user.name last_name: user.name } - + project: (project) -> if !project? return null @@ -20,3 +20,17 @@ module.exports = id: project._id name: project.name } + + docs: (docs) -> + docs.map (doc) -> + { + path: doc.path + id: doc.doc + } + + files: (files) -> + files.map (file) -> + { + path: file.path + id: file.file + }