Просмотр исходного кода

extra logging for DocumentUpdaterHandler

Hayden Faulds 8 лет назад
Родитель
Сommit
a7945e9b96

+ 2 - 0
services/web/app.coffee

@@ -2,6 +2,8 @@ Settings = require('settings-sharelatex')
 logger = require 'logger-sharelatex'
 logger = require 'logger-sharelatex'
 logger.initialize("web-sharelatex")
 logger.initialize("web-sharelatex")
 logger.logger.serializers.user = require("./app/js/infrastructure/LoggerSerializers").user
 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
 logger.logger.serializers.project = require("./app/js/infrastructure/LoggerSerializers").project
 if Settings.sentry?.dsn?
 if Settings.sentry?.dsn?
 	logger.initializeErrorReporting(Settings.sentry.dsn)
 	logger.initializeErrorReporting(Settings.sentry.dsn)

+ 2 - 1
services/web/app/coffee/Features/DocumentUpdater/DocumentUpdaterHandler.coffee

@@ -122,7 +122,7 @@ module.exports = DocumentUpdaterHandler =
 		}, project_id, "delete-thread", callback
 		}, project_id, "delete-thread", callback
 
 
 	resyncProjectHistory: (project_id, docs, files, 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 {
 		DocumentUpdaterHandler._makeRequest {
 			path: "/project/#{project_id}/history/resync"
 			path: "/project/#{project_id}/history/resync"
 			json: { docs, files }
 			json: { docs, files }
@@ -141,6 +141,7 @@ module.exports = DocumentUpdaterHandler =
 
 
 			return callback() if (docUpdates.length + fileUpdates.length) < 1
 			return callback() if (docUpdates.length + fileUpdates.length) < 1
 
 
+			logger.log {project_id}, "updating project structure in doc updater"
 			DocumentUpdaterHandler._makeRequest {
 			DocumentUpdaterHandler._makeRequest {
 				path: "/project/#{project_id}"
 				path: "/project/#{project_id}"
 				json: { docUpdates, fileUpdates, userId, version: currentProject.version }
 				json: { docUpdates, fileUpdates, userId, version: currentProject.version }

+ 15 - 1
services/web/app/coffee/infrastructure/LoggerSerializers.coffee

@@ -10,7 +10,7 @@ module.exports =
 			first_name: user.name
 			first_name: user.name
 			last_name: user.name
 			last_name: user.name
 		}
 		}
-	
+
 	project: (project) ->
 	project: (project) ->
 		if !project?
 		if !project?
 			return null
 			return null
@@ -20,3 +20,17 @@ module.exports =
 			id: project._id
 			id: project._id
 			name: project.name
 			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
+			}