From 35a90b9cbc334794e1dcc68e99eaf7c60743d4ab Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Mon, 20 Oct 2014 14:22:31 +0100 Subject: [PATCH] removed type: from log lines --- .../web/app/coffee/Features/Project/ProjectController.coffee | 2 +- .../app/coffee/Features/Project/ProjectEntityHandler.coffee | 2 +- .../coffee/Features/ThirdPartyDataStore/UpdateMerger.coffee | 2 +- services/web/app/coffee/models/Project.coffee | 3 +-- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/services/web/app/coffee/Features/Project/ProjectController.coffee b/services/web/app/coffee/Features/Project/ProjectController.coffee index 512fe00dba..c55f3d5c4f 100644 --- a/services/web/app/coffee/Features/Project/ProjectController.coffee +++ b/services/web/app/coffee/Features/Project/ProjectController.coffee @@ -90,7 +90,7 @@ module.exports = ProjectController = user = req.session.user projectName = req.body.projectName?.trim() template = req.body.template - logger.log user: user, type: template, name: projectName, "creating project" + logger.log user: user, projectType: template, name: projectName, "creating project" async.waterfall [ (cb)-> if template == 'example' diff --git a/services/web/app/coffee/Features/Project/ProjectEntityHandler.coffee b/services/web/app/coffee/Features/Project/ProjectEntityHandler.coffee index e786c6c606..8cf3d2e7a8 100644 --- a/services/web/app/coffee/Features/Project/ProjectEntityHandler.coffee +++ b/services/web/app/coffee/Features/Project/ProjectEntityHandler.coffee @@ -306,7 +306,7 @@ module.exports = ProjectEntityHandler = deleteEntity: (project_id, entity_id, entityType, callback = (error) ->)-> self = @ - logger.log entity_id:entity_id, type:entityType, project_id:project_id, "deleting project entity" + logger.log entity_id:entity_id, entityType:entityType, project_id:project_id, "deleting project entity" if !entityType? logger.err err: "No entityType set", project_id: project_id, entity_id: entity_id return callback("No entityType set") diff --git a/services/web/app/coffee/Features/ThirdPartyDataStore/UpdateMerger.coffee b/services/web/app/coffee/Features/ThirdPartyDataStore/UpdateMerger.coffee index c026f44e98..331163b535 100644 --- a/services/web/app/coffee/Features/ThirdPartyDataStore/UpdateMerger.coffee +++ b/services/web/app/coffee/Features/ThirdPartyDataStore/UpdateMerger.coffee @@ -36,7 +36,7 @@ module.exports = type = 'doc' else if element.folders? type = 'folder' - logger.log project_id:project_id, path:path, type:type, element:element, "processing update to delete entity from tpds" + logger.log project_id:project_id, updateType:path, type:type, element:element, "processing update to delete entity from tpds" editorController.deleteEntity project_id, element._id, type, source, (err)-> logger.log project_id:project_id, path:path, "finished processing update to delete entity from tpds" callback() diff --git a/services/web/app/coffee/models/Project.coffee b/services/web/app/coffee/models/Project.coffee index 25bafe81ac..648d7885f7 100644 --- a/services/web/app/coffee/models/Project.coffee +++ b/services/web/app/coffee/models/Project.coffee @@ -83,8 +83,7 @@ ProjectSchema.statics.putElement = (project_id, folder_id, element, type, callba mongo: path.mongo # TODO: This is not correct if err? callback(err) - logger.log project_id: project_id, element_id: element._id, type: type, folder_id: folder_id, - "adding element to project" + logger.log project_id: project_id, element_id: element._id, fileType: type, folder_id: folder_id, "adding element to project" id = element._id+'' element._id = concreteObjectId(id) conditions = _id:project_id