diff --git a/services/web/app/src/Features/Analytics/AnalyticsManager.js b/services/web/app/src/Features/Analytics/AnalyticsManager.js index 1018daca50..9e3393aebd 100644 --- a/services/web/app/src/Features/Analytics/AnalyticsManager.js +++ b/services/web/app/src/Features/Analytics/AnalyticsManager.js @@ -153,7 +153,7 @@ module.exports = { makeAnalyticsRequest(userId, opts, function(err, response, body) { if (err != null) { console.log(response, opts) - logger.err({ userId, err }, 'error getting last occurance of event') + logger.warn({ userId, err }, 'error getting last occurance of event') callback(err) } else { callback(null, body) diff --git a/services/web/app/src/Features/Announcements/AnnouncementsController.js b/services/web/app/src/Features/Announcements/AnnouncementsController.js index d515c6620e..a079afe2a8 100644 --- a/services/web/app/src/Features/Announcements/AnnouncementsController.js +++ b/services/web/app/src/Features/Announcements/AnnouncementsController.js @@ -40,7 +40,7 @@ module.exports = { announcements ) { if (err != null) { - logger.err( + logger.warn( { err, user_id: user._id }, 'unable to get unread announcements' ) diff --git a/services/web/app/src/Features/Announcements/AnnouncementsHandler.js b/services/web/app/src/Features/Announcements/AnnouncementsHandler.js index 36b24e2f85..dafcc2d165 100644 --- a/services/web/app/src/Features/Announcements/AnnouncementsHandler.js +++ b/services/web/app/src/Features/Announcements/AnnouncementsHandler.js @@ -61,7 +61,7 @@ module.exports = AnnouncementsHandler = { }, function(err, results) { if (err != null) { - logger.err( + logger.warn( { err, user_id: user._id }, 'error getting unread announcements' ) diff --git a/services/web/app/src/Features/Authentication/AuthenticationController.js b/services/web/app/src/Features/Authentication/AuthenticationController.js index 638e896537..3cf821c80c 100644 --- a/services/web/app/src/Features/Authentication/AuthenticationController.js +++ b/services/web/app/src/Features/Authentication/AuthenticationController.js @@ -51,7 +51,7 @@ const AuthenticationController = (module.exports = { } return req.login(user, function(err) { if (err != null) { - logger.err({ user_id: user._id, err }, 'error from req.login') + logger.warn({ user_id: user._id, err }, 'error from req.login') return callback(err) } // Regenerate the session to get a new sessionID (cookie value) to @@ -59,7 +59,7 @@ const AuthenticationController = (module.exports = { const oldSession = req.session return req.session.destroy(function(err) { if (err != null) { - logger.err( + logger.warn( { user_id: user._id, err }, 'error when trying to destroy old session' ) @@ -76,7 +76,7 @@ const AuthenticationController = (module.exports = { req.session.user = req.session.passport.user return req.session.save(function(err) { if (err != null) { - logger.err( + logger.warn( { user_id: user._id }, 'error saving regenerated session after login' ) diff --git a/services/web/app/src/Features/BetaProgram/BetaProgramController.js b/services/web/app/src/Features/BetaProgram/BetaProgramController.js index b5e82709e1..69c1b66f1a 100644 --- a/services/web/app/src/Features/BetaProgram/BetaProgramController.js +++ b/services/web/app/src/Features/BetaProgram/BetaProgramController.js @@ -51,7 +51,7 @@ module.exports = BetaProgramController = { logger.log({ user_id }, 'showing beta participation page for user') return UserGetter.getUser(user_id, function(err, user) { if (err) { - logger.err({ err, user_id }, 'error fetching user') + logger.warn({ err, user_id }, 'error fetching user') return next(err) } return res.render('beta_program/opt_in', { diff --git a/services/web/app/src/Features/BetaProgram/BetaProgramHandler.js b/services/web/app/src/Features/BetaProgram/BetaProgramHandler.js index adccaaa2d4..0e6dbb3087 100644 --- a/services/web/app/src/Features/BetaProgram/BetaProgramHandler.js +++ b/services/web/app/src/Features/BetaProgram/BetaProgramHandler.js @@ -24,14 +24,14 @@ module.exports = BetaProgramHandler = { } return User.findById(user_id, function(err, user) { if (err) { - logger.err({ err, user_id }, 'problem adding user to beta') + logger.warn({ err, user_id }, 'problem adding user to beta') return callback(err) } metrics.inc('beta-program.opt-in') user.betaProgram = true return user.save(function(err) { if (err) { - logger.err({ err, user_id }, 'problem adding user to beta') + logger.warn({ err, user_id }, 'problem adding user to beta') return callback(err) } return callback(null) @@ -45,14 +45,14 @@ module.exports = BetaProgramHandler = { } return User.findById(user_id, function(err, user) { if (err) { - logger.err({ err, user_id }, 'problem removing user from beta') + logger.warn({ err, user_id }, 'problem removing user from beta') return callback(err) } metrics.inc('beta-program.opt-out') user.betaProgram = false return user.save(function(err) { if (err) { - logger.err({ err, user_id }, 'problem removing user from beta') + logger.warn({ err, user_id }, 'problem removing user from beta') return callback(err) } return callback(null) diff --git a/services/web/app/src/Features/BrandVariations/BrandVariationsHandler.js b/services/web/app/src/Features/BrandVariations/BrandVariationsHandler.js index 89e25ad8a7..715fe2bc5e 100644 --- a/services/web/app/src/Features/BrandVariations/BrandVariationsHandler.js +++ b/services/web/app/src/Features/BrandVariations/BrandVariationsHandler.js @@ -34,7 +34,7 @@ module.exports = BrandVariationsHandler = { }, function(error, response, brandVariationDetails) { if (error != null) { - logger.err( + logger.warn( { brandVariationId, error }, 'error getting brand variation details' ) diff --git a/services/web/app/src/Features/Chat/ChatApiHandler.js b/services/web/app/src/Features/Chat/ChatApiHandler.js index 2f0a6689ae..1c2a12fe5e 100644 --- a/services/web/app/src/Features/Chat/ChatApiHandler.js +++ b/services/web/app/src/Features/Chat/ChatApiHandler.js @@ -32,7 +32,7 @@ module.exports = ChatApiHandler = { `chat api returned non-success code: ${response.statusCode}` ) error.statusCode = response.statusCode - logger.error({ err: error, opts }, 'error sending request to chat api') + logger.warn({ err: error, opts }, 'error sending request to chat api') return callback(error) } }) diff --git a/services/web/app/src/Features/Collaborators/CollaboratorsController.js b/services/web/app/src/Features/Collaborators/CollaboratorsController.js index f4a697e926..ec41b97f08 100644 --- a/services/web/app/src/Features/Collaborators/CollaboratorsController.js +++ b/services/web/app/src/Features/Collaborators/CollaboratorsController.js @@ -82,7 +82,7 @@ const CollaboratorsController = { members ) { if (err != null) { - logger.err({ projectId }, 'error getting members for project') + logger.warn({ projectId }, 'error getting members for project') return next(err) } res.json({ members }) diff --git a/services/web/app/src/Features/Collaborators/CollaboratorsHandler.js b/services/web/app/src/Features/Collaborators/CollaboratorsHandler.js index f9535b4249..073ccbafcc 100644 --- a/services/web/app/src/Features/Collaborators/CollaboratorsHandler.js +++ b/services/web/app/src/Features/Collaborators/CollaboratorsHandler.js @@ -367,10 +367,7 @@ module.exports = CollaboratorsHandler = { } return Project.update(conditions, update, function(err) { if (err != null) { - logger.error( - { err }, - 'problem removing user from project collaberators' - ) + logger.warn({ err }, 'problem removing user from project collaberators') } return callback(err) }) @@ -496,7 +493,7 @@ module.exports = CollaboratorsHandler = { projectId, function(error, rawMembers) { if (error != null) { - logger.err({ projectId, error }, 'error getting members for project') + logger.warn({ projectId, error }, 'error getting members for project') return callback(error) } const { diff --git a/services/web/app/src/Features/Collaborators/CollaboratorsInviteController.js b/services/web/app/src/Features/Collaborators/CollaboratorsInviteController.js index 64d82b04d6..933e514148 100644 --- a/services/web/app/src/Features/Collaborators/CollaboratorsInviteController.js +++ b/services/web/app/src/Features/Collaborators/CollaboratorsInviteController.js @@ -37,7 +37,7 @@ module.exports = CollaboratorsInviteController = { invites ) { if (err != null) { - logger.err({ projectId }, 'error getting invites for project') + logger.warn({ projectId }, 'error getting invites for project') return next(err) } return res.json({ invites }) @@ -144,7 +144,7 @@ module.exports = CollaboratorsInviteController = { email, function(err, shouldAllowInvite) { if (err != null) { - logger.err( + logger.warn( { err, email, projectId, sendingUserId }, 'error checking if we can invite this email address' ) @@ -167,7 +167,7 @@ module.exports = CollaboratorsInviteController = { privileges, function(err, invite) { if (err != null) { - logger.err( + logger.warn( { projectId, email, sendingUserId }, 'error creating project invite' ) @@ -202,7 +202,7 @@ module.exports = CollaboratorsInviteController = { inviteId, function(err) { if (err != null) { - logger.err({ projectId, inviteId }, 'error revoking invite') + logger.warn({ projectId, inviteId }, 'error revoking invite') return next(err) } EditorRealTimeController.emitToRoom( @@ -235,7 +235,7 @@ module.exports = CollaboratorsInviteController = { inviteId, function(err) { if (err != null) { - logger.err({ projectId, inviteId }, 'error resending invite') + logger.warn({ projectId, inviteId }, 'error resending invite') return next(err) } return res.sendStatus(201) @@ -262,7 +262,7 @@ module.exports = CollaboratorsInviteController = { projectId, function(err, isMember, _privilegeLevel) { if (err != null) { - logger.err( + logger.warn( { err, projectId }, 'error checking if user is member of project' ) @@ -281,7 +281,7 @@ module.exports = CollaboratorsInviteController = { token, function(err, invite) { if (err != null) { - logger.err({ projectId, token }, 'error getting invite by token') + logger.warn({ projectId, token }, 'error getting invite by token') return next(err) } // check if invite is gone, or otherwise non-existent @@ -295,7 +295,7 @@ module.exports = CollaboratorsInviteController = { { email: 1, first_name: 1, last_name: 1 }, function(err, owner) { if (err != null) { - logger.err({ err, projectId }, 'error getting project owner') + logger.warn({ err, projectId }, 'error getting project owner') return next(err) } if (owner == null) { @@ -308,7 +308,7 @@ module.exports = CollaboratorsInviteController = { project ) { if (err != null) { - logger.err({ err, projectId }, 'error getting project') + logger.warn({ err, projectId }, 'error getting project') return next(err) } if (project == null) { @@ -345,7 +345,7 @@ module.exports = CollaboratorsInviteController = { currentUser, function(err) { if (err != null) { - logger.err({ projectId, token }, 'error accepting invite by token') + logger.warn({ projectId, token }, 'error accepting invite by token') return next(err) } EditorRealTimeController.emitToRoom( diff --git a/services/web/app/src/Features/Collaborators/CollaboratorsInviteHandler.js b/services/web/app/src/Features/Collaborators/CollaboratorsInviteHandler.js index 5e8950f74c..a97278c73f 100644 --- a/services/web/app/src/Features/Collaborators/CollaboratorsInviteHandler.js +++ b/services/web/app/src/Features/Collaborators/CollaboratorsInviteHandler.js @@ -32,7 +32,7 @@ module.exports = CollaboratorsInviteHandler = { logger.log({ projectId }, 'fetching invites for project') return ProjectInvite.find({ projectId }, function(err, invites) { if (err != null) { - logger.err({ err, projectId }, 'error getting invites from mongo') + logger.warn({ err, projectId }, 'error getting invites from mongo') return callback(err) } logger.log( @@ -50,7 +50,7 @@ module.exports = CollaboratorsInviteHandler = { logger.log({ projectId }, 'counting invites for project') return ProjectInvite.count({ projectId }, function(err, count) { if (err != null) { - logger.err({ err, projectId }, 'error getting invites from mongo') + logger.warn({ err, projectId }, 'error getting invites from mongo') return callback(err) } return callback(null, count) @@ -67,7 +67,7 @@ module.exports = CollaboratorsInviteHandler = { existingUser ) { if (err != null) { - logger.err({ projectId, email }, 'error checking if user exists') + logger.warn({ projectId, email }, 'error checking if user exists') return callback(err) } if (existingUser == null) { @@ -79,7 +79,7 @@ module.exports = CollaboratorsInviteHandler = { project ) { if (err != null) { - logger.err({ projectId, email }, 'error getting project') + logger.warn({ projectId, email }, 'error getting project') return callback(err) } if (project == null) { @@ -153,7 +153,7 @@ module.exports = CollaboratorsInviteHandler = { ) return Crypto.randomBytes(24, function(err, buffer) { if (err != null) { - logger.err( + logger.warn( { err, projectId, sendingUserId: sendingUser._id, email }, 'error generating random token' ) @@ -169,7 +169,7 @@ module.exports = CollaboratorsInviteHandler = { }) return invite.save(function(err, invite) { if (err != null) { - logger.err( + logger.warn( { err, projectId, sendingUserId: sendingUser._id, email }, 'error saving token' ) @@ -201,7 +201,7 @@ module.exports = CollaboratorsInviteHandler = { logger.log({ projectId, inviteId }, 'removing invite') return ProjectInvite.remove({ projectId, _id: inviteId }, function(err) { if (err != null) { - logger.err({ err, projectId, inviteId }, 'error removing invite') + logger.warn({ err, projectId, inviteId }, 'error removing invite') return callback(err) } CollaboratorsInviteHandler._tryCancelInviteNotification( @@ -222,7 +222,7 @@ module.exports = CollaboratorsInviteHandler = { invite ) { if (err != null) { - logger.err({ err, projectId, inviteId }, 'error finding invite') + logger.warn({ err, projectId, inviteId }, 'error finding invite') return callback(err) } if (invite == null) { @@ -238,7 +238,7 @@ module.exports = CollaboratorsInviteHandler = { invite, function(err) { if (err != null) { - logger.err( + logger.warn( { projectId, inviteId }, 'error resending invite messages' ) @@ -260,7 +260,7 @@ module.exports = CollaboratorsInviteHandler = { invite ) { if (err != null) { - logger.err({ err, projectId }, 'error fetching invite') + logger.warn({ err, projectId }, 'error fetching invite') return callback(err) } if (invite == null) { @@ -281,7 +281,7 @@ module.exports = CollaboratorsInviteHandler = { tokenString, function(err, invite) { if (err != null) { - logger.err({ err, projectId, tokenString }, 'error finding invite') + logger.warn({ err, projectId, tokenString }, 'error finding invite') return callback(err) } if (!invite) { @@ -300,7 +300,7 @@ module.exports = CollaboratorsInviteHandler = { invite.privileges, function(err) { if (err != null) { - logger.err( + logger.warn( { err, projectId, inviteId, userId: user._id }, 'error adding user to project' ) @@ -310,7 +310,7 @@ module.exports = CollaboratorsInviteHandler = { logger.log({ projectId, inviteId }, 'removing invite') return ProjectInvite.remove({ _id: inviteId }, function(err) { if (err != null) { - logger.err( + logger.warn( { err, projectId, inviteId }, 'error removing invite' ) diff --git a/services/web/app/src/Features/Compile/ClsiCookieManager.js b/services/web/app/src/Features/Compile/ClsiCookieManager.js index ad120afcc2..8a07882fd7 100644 --- a/services/web/app/src/Features/Compile/ClsiCookieManager.js +++ b/services/web/app/src/Features/Compile/ClsiCookieManager.js @@ -59,7 +59,7 @@ module.exports = function(backendGroup) { const url = `${Settings.apis.clsi.url}/project/${project_id}/status` return request.get(url, (err, res, body) => { if (err != null) { - logger.err( + logger.warn( { err, project_id }, 'error getting initial server id for project' ) @@ -67,7 +67,7 @@ module.exports = function(backendGroup) { } return this.setServerId(project_id, res, function(err, serverId) { if (err != null) { - logger.err( + logger.warn( { err, project_id }, 'error setting server id via populate request' ) @@ -139,7 +139,7 @@ module.exports = function(backendGroup) { } return this._getServerId(project_id, (err, serverId) => { if (err != null) { - logger.err({ err, project_id }, 'error getting server id') + logger.warn({ err, project_id }, 'error getting server id') return callback(err) } const serverCookie = request.cookie( diff --git a/services/web/app/src/Features/Compile/ClsiManager.js b/services/web/app/src/Features/Compile/ClsiManager.js index 0aea76bc4e..406007a4c0 100644 --- a/services/web/app/src/Features/Compile/ClsiManager.js +++ b/services/web/app/src/Features/Compile/ClsiManager.js @@ -202,7 +202,7 @@ module.exports = ClsiManager = { req.compile != null ? req.compile.resources : undefined, function(err, validationProblems) { if (err != null) { - logger.err( + logger.warn( err, project_id, 'could not check resources for potential problems before sending to clsi' @@ -229,7 +229,7 @@ module.exports = ClsiManager = { options.compileGroup, function(error, response) { if (error != null) { - logger.err( + logger.warn( { err: error, project_id }, 'error sending request to clsi' ) @@ -255,7 +255,7 @@ module.exports = ClsiManager = { clsiServerId ) { if (err != null) { - logger.err({ err, project_id }, 'error getting server id') + logger.warn({ err, project_id }, 'error getting server id') return callback(err) } const outputFiles = ClsiManager._parseOutputFiles( @@ -288,7 +288,7 @@ module.exports = ClsiManager = { const startTime = new Date() return ClsiCookieManager.getCookieJar(project_id, function(err, jar) { if (err != null) { - logger.err({ err }, 'error getting cookie jar for clsi request') + logger.warn({ err }, 'error getting cookie jar for clsi request') return callback(err) } opts.jar = jar @@ -301,7 +301,7 @@ module.exports = ClsiManager = { }` ) if (err != null) { - logger.err( + logger.warn( { err, project_id, url: opts != null ? opts.url : undefined }, 'error making request to clsi' ) @@ -404,7 +404,7 @@ module.exports = ClsiManager = { jar ) { if (err != null) { - logger.err({ err }, 'error getting cookie jar for clsi request') + logger.warn({ err }, 'error getting cookie jar for clsi request') return callback(err) } opts.jar = jar @@ -482,7 +482,7 @@ module.exports = ClsiManager = { error = new Error( `CLSI returned non-success code: ${response.statusCode}` ) - logger.error({ err: error, project_id }, 'CLSI returned failure code') + logger.warn({ err: error, project_id }, 'CLSI returned failure code') return callback(error, body) } }) @@ -907,7 +907,7 @@ module.exports = ClsiManager = { error = new Error( `CLSI returned non-success code: ${response.statusCode}` ) - logger.error({ err: error, project_id }, 'CLSI returned failure code') + logger.warn({ err: error, project_id }, 'CLSI returned failure code') return callback(error, body) } }) diff --git a/services/web/app/src/Features/Compile/CompileController.js b/services/web/app/src/Features/Compile/CompileController.js index 96833c07ff..b4c8a7b0f9 100644 --- a/services/web/app/src/Features/Compile/CompileController.js +++ b/services/web/app/src/Features/Compile/CompileController.js @@ -482,7 +482,7 @@ module.exports = CompileController = { return ClsiCookieManager.getCookieJar(project_id, function(err, jar) { let qs if (err != null) { - logger.err({ err }, 'error getting cookie jar for clsi request') + logger.warn({ err }, 'error getting cookie jar for clsi request') return callback(err) } // expand any url parameter passed in as {url:..., qs:...} diff --git a/services/web/app/src/Features/Contacts/ContactManager.js b/services/web/app/src/Features/Contacts/ContactManager.js index b97ba05d35..0294aab19f 100644 --- a/services/web/app/src/Features/Contacts/ContactManager.js +++ b/services/web/app/src/Features/Contacts/ContactManager.js @@ -47,7 +47,7 @@ module.exports = ContactManager = { error = new Error( `contacts api responded with non-success code: ${res.statusCode}` ) - logger.error( + logger.warn( { err: error, user_id }, 'error getting contacts for user' ) @@ -84,7 +84,7 @@ module.exports = ContactManager = { error = new Error( `contacts api responded with non-success code: ${res.statusCode}` ) - logger.error( + logger.warn( { err: error, user_id, contact_id }, 'error adding contact for user' ) diff --git a/services/web/app/src/Features/Docstore/DocstoreManager.js b/services/web/app/src/Features/Docstore/DocstoreManager.js index e43bcd1071..28f4a13173 100644 --- a/services/web/app/src/Features/Docstore/DocstoreManager.js +++ b/services/web/app/src/Features/Docstore/DocstoreManager.js @@ -35,7 +35,7 @@ module.exports = DocstoreManager = { return callback(null) } else if (res.statusCode === 404) { error = new Errors.NotFoundError('tried to delete doc not in docstore') - logger.error( + logger.warn( { err: error, project_id, doc_id }, 'tried to delete doc not in docstore' ) @@ -44,7 +44,7 @@ module.exports = DocstoreManager = { error = new Error( `docstore api responded with non-success code: ${res.statusCode}` ) - logger.error( + logger.warn( { err: error, project_id, doc_id }, 'error deleting doc in docstore' ) @@ -74,7 +74,7 @@ module.exports = DocstoreManager = { error = new Error( `docstore api responded with non-success code: ${res.statusCode}` ) - logger.error( + logger.warn( { err: error, project_id }, 'error getting all docs from docstore' ) @@ -108,7 +108,7 @@ module.exports = DocstoreManager = { error = new Error( `docstore api responded with non-success code: ${res.statusCode}` ) - logger.error( + logger.warn( { err: error, project_id }, 'error getting all doc ranges from docstore' ) @@ -153,7 +153,7 @@ module.exports = DocstoreManager = { return callback(null, doc.lines, doc.rev, doc.version, doc.ranges) } else if (res.statusCode === 404) { error = new Errors.NotFoundError('doc not found in docstore') - logger.error( + logger.warn( { err: error, project_id, doc_id }, 'doc not found in docstore' ) @@ -162,7 +162,7 @@ module.exports = DocstoreManager = { error = new Error( `docstore api responded with non-success code: ${res.statusCode}` ) - logger.error( + logger.warn( { err: error, project_id, doc_id }, 'error getting doc from docstore' ) @@ -203,7 +203,7 @@ module.exports = DocstoreManager = { error = new Error( `docstore api responded with non-success code: ${res.statusCode}` ) - logger.error( + logger.warn( { err: error, project_id, doc_id }, 'error updating doc in docstore' ) @@ -218,7 +218,7 @@ module.exports = DocstoreManager = { logger.log({ project_id }, 'archiving project in docstore') return request.post(url, function(err, res, docs) { if (err != null) { - logger.err({ err, project_id }, 'error archving project in docstore') + logger.warn({ err, project_id }, 'error archving project in docstore') return callback(err) } if (res.statusCode >= 200 && res.statusCode < 300) { @@ -227,7 +227,7 @@ module.exports = DocstoreManager = { const error = new Error( `docstore api responded with non-success code: ${res.statusCode}` ) - logger.err( + logger.warn( { err: error, project_id }, 'error archiving project in docstore' ) @@ -241,7 +241,10 @@ module.exports = DocstoreManager = { logger.log({ project_id }, 'unarchiving project in docstore') return request.post(url, function(err, res, docs) { if (err != null) { - logger.err({ err, project_id }, 'error unarchiving project in docstore') + logger.warn( + { err, project_id }, + 'error unarchiving project in docstore' + ) return callback(err) } if (res.statusCode >= 200 && res.statusCode < 300) { @@ -250,7 +253,7 @@ module.exports = DocstoreManager = { const error = new Error( `docstore api responded with non-success code: ${res.statusCode}` ) - logger.err( + logger.warn( { err: error, project_id }, 'error unarchiving project in docstore' ) diff --git a/services/web/app/src/Features/DocumentUpdater/DocumentUpdaterHandler.js b/services/web/app/src/Features/DocumentUpdater/DocumentUpdaterHandler.js index 18d0720b0a..6d0ea86019 100644 --- a/services/web/app/src/Features/DocumentUpdater/DocumentUpdaterHandler.js +++ b/services/web/app/src/Features/DocumentUpdater/DocumentUpdaterHandler.js @@ -164,7 +164,7 @@ module.exports = DocumentUpdaterHandler = { return request.post(url, function(error, res, body) { timer.done() if (error != null) { - logger.error( + logger.warn( { err: error, url, project_id }, 'error getting project docs from doc updater' ) @@ -192,7 +192,7 @@ module.exports = DocumentUpdaterHandler = { } return callback(null, docs) } else { - logger.error( + logger.warn( { project_id, url }, `doc updater returned a non-success status code: ${res.statusCode}` ) @@ -320,7 +320,7 @@ module.exports = DocumentUpdaterHandler = { } if (projectVersion == null) { - logger.error( + logger.warn( { project_id, changes, projectVersion }, 'did not receive project version in changes' ) @@ -357,7 +357,7 @@ module.exports = DocumentUpdaterHandler = { function(error, res, body) { timer.done() if (error != null) { - logger.error( + logger.warn( { error, project_id }, 'error making request to document updater' ) @@ -368,7 +368,7 @@ module.exports = DocumentUpdaterHandler = { error = new Error( `document updater returned a failure status code: ${res.statusCode}` ) - logger.error( + logger.warn( { error, project_id }, `document updater returned failure status code: ${res.statusCode}` ) diff --git a/services/web/app/src/Features/Documents/DocumentController.js b/services/web/app/src/Features/Documents/DocumentController.js index a9b8e05ba3..fd0e4424d6 100644 --- a/services/web/app/src/Features/Documents/DocumentController.js +++ b/services/web/app/src/Features/Documents/DocumentController.js @@ -45,7 +45,7 @@ module.exports = { { project, element_id: doc_id, type: 'doc' }, function(error, doc, path) { if (error != null) { - logger.err( + logger.warn( { err: error, doc_id, project_id }, 'error finding element for getDocument' ) @@ -59,7 +59,7 @@ module.exports = { ranges ) { if (error != null) { - logger.err( + logger.warn( { err: error, doc_id, project_id }, 'error finding doc contents for getDocument' ) @@ -112,7 +112,7 @@ module.exports = { lastUpdatedBy, function(error) { if (error != null) { - logger.err( + logger.warn( { err: error, doc_id, project_id }, 'error finding element for getDocument' ) diff --git a/services/web/app/src/Features/Downloads/ProjectZipStreamManager.js b/services/web/app/src/Features/Downloads/ProjectZipStreamManager.js index ece438fdf7..24d8ee4e8c 100644 --- a/services/web/app/src/Features/Downloads/ProjectZipStreamManager.js +++ b/services/web/app/src/Features/Downloads/ProjectZipStreamManager.js @@ -159,7 +159,7 @@ module.exports = ProjectZipStreamManager = { stream ) { if (error != null) { - logger.err( + logger.warn( { err: error, project_id, file_id: file._id }, 'something went wrong adding file to zip archive' ) diff --git a/services/web/app/src/Features/Editor/EditorController.js b/services/web/app/src/Features/Editor/EditorController.js index 4a62c4c1e8..0002455919 100644 --- a/services/web/app/src/Features/Editor/EditorController.js +++ b/services/web/app/src/Features/Editor/EditorController.js @@ -72,7 +72,7 @@ module.exports = EditorController = { user_id, (err, doc, folder_id) => { if (err != null) { - logger.err( + logger.warn( { err, project_id, docName }, 'error adding doc without lock' ) @@ -126,7 +126,7 @@ module.exports = EditorController = { user_id, (err, fileRef, folder_id) => { if (err != null) { - logger.err( + logger.warn( { err, project_id, folder_id, fileName }, 'error adding file without lock' ) @@ -334,7 +334,7 @@ module.exports = EditorController = { folderName, (err, folder, folder_id) => { if (err != null) { - logger.err( + logger.warn( { err, project_id, folder_id, folderName, source }, 'could not add folder' ) @@ -365,7 +365,7 @@ module.exports = EditorController = { path, (err, newFolders, lastFolder) => { if (err != null) { - logger.err({ err, project_id, path }, 'could not mkdirp') + logger.warn({ err, project_id, path }, 'could not mkdirp') return callback(err) } @@ -399,7 +399,7 @@ module.exports = EditorController = { userId, function(err) { if (err != null) { - logger.err( + logger.warn( { err, project_id, entity_id, entityType }, 'could not delete entity' ) @@ -458,7 +458,7 @@ module.exports = EditorController = { description, function(err) { if (err != null) { - logger.err( + logger.warn( { err, project_id, description }, 'something went wrong setting the project description' ) @@ -498,7 +498,7 @@ module.exports = EditorController = { userId, function(err) { if (err != null) { - logger.err( + logger.warn( { err, project_id, entity_id, entityType, newName }, 'error renaming entity' ) @@ -530,7 +530,7 @@ module.exports = EditorController = { userId, function(err) { if (err != null) { - logger.err( + logger.warn( { err, project_id, entity_id, folder_id }, 'error moving entity' ) @@ -555,7 +555,7 @@ module.exports = EditorController = { err ) { if (err != null) { - logger.err({ err, project_id, newName }, 'error renaming project') + logger.warn({ err, project_id, newName }, 'error renaming project') return callback(err) } EditorRealTimeController.emitToRoom( diff --git a/services/web/app/src/Features/Email/EmailSender.js b/services/web/app/src/Features/Email/EmailSender.js index 8166fc618d..0ce3668fa6 100644 --- a/services/web/app/src/Features/Email/EmailSender.js +++ b/services/web/app/src/Features/Email/EmailSender.js @@ -190,7 +190,7 @@ module.exports = { } return client.sendMail(options, function(err, res) { if (err != null) { - logger.err({ err }, 'error sending message') + logger.warn({ err }, 'error sending message') err = new Error('Cannot send email') } else { logger.log(`Message sent to ${options.to}`) diff --git a/services/web/app/src/Features/Exports/ExportsHandler.js b/services/web/app/src/Features/Exports/ExportsHandler.js index 5bd72e7acd..98a6d8de12 100644 --- a/services/web/app/src/Features/Exports/ExportsHandler.js +++ b/services/web/app/src/Features/Exports/ExportsHandler.js @@ -103,7 +103,7 @@ module.exports = ExportsHandler = self = { return async.auto(jobs, function(err, results) { if (err != null) { - logger.err( + logger.warn( { err, project_id, user_id, brand_variation_id }, 'error building project export' ) @@ -113,7 +113,7 @@ module.exports = ExportsHandler = self = { const { project, rootDoc, user, historyVersion } = results if (rootDoc[1] == null) { err = new Error('cannot export project without root doc') - logger.err({ err, project_id }) + logger.warn({ err, project_id }) return callback(err) } @@ -174,7 +174,7 @@ module.exports = ExportsHandler = self = { }, function(err, res, body) { if (err != null) { - logger.err( + logger.warn( { err, export: export_data }, 'error making request to v1 export' ) @@ -182,7 +182,7 @@ module.exports = ExportsHandler = self = { } else if (res.statusCode >= 200 && res.statusCode < 300) { return callback(null, body.exportId) } else { - logger.err( + logger.warn( { export: export_data }, `v1 export returned failure; forwarding: ${body}` ) @@ -206,7 +206,7 @@ module.exports = ExportsHandler = self = { }, function(err, res, body) { if (err != null) { - logger.err( + logger.warn( { err, project_id }, 'error making request to project history' ) @@ -219,7 +219,7 @@ module.exports = ExportsHandler = self = { res.statusCode }` ) - logger.err( + logger.warn( { err, project_id }, `project history version returned failure status code: ${ res.statusCode @@ -242,7 +242,7 @@ module.exports = ExportsHandler = self = { }, function(err, res, body) { if (err != null) { - logger.err( + logger.warn( { err, export: export_id }, 'error making request to v1 export' ) @@ -253,7 +253,7 @@ module.exports = ExportsHandler = self = { err = new Error( `v1 export returned a failure status code: ${res.statusCode}` ) - logger.err( + logger.warn( { err, export: export_id }, `v1 export returned failure status code: ${res.statusCode}` ) @@ -276,7 +276,7 @@ module.exports = ExportsHandler = self = { }, function(err, res, body) { if (err != null) { - logger.err( + logger.warn( { err, export: export_id }, 'error making request to v1 export' ) @@ -287,7 +287,7 @@ module.exports = ExportsHandler = self = { err = new Error( `v1 export returned a failure status code: ${res.statusCode}` ) - logger.err( + logger.warn( { err, export: export_id }, `v1 export zip fetch returned failure status code: ${ res.statusCode diff --git a/services/web/app/src/Features/FileStore/FileHashManager.js b/services/web/app/src/Features/FileStore/FileHashManager.js index f4865ae686..fecdc1cdb0 100644 --- a/services/web/app/src/Features/FileStore/FileHashManager.js +++ b/services/web/app/src/Features/FileStore/FileHashManager.js @@ -42,7 +42,7 @@ module.exports = FileHashManager = { const input = fs.createReadStream(filePath) input.on('error', function(err) { - logger.err({ filePath, err }, 'error opening file in computeHash') + logger.warn({ filePath, err }, 'error opening file in computeHash') return callback(err) }) diff --git a/services/web/app/src/Features/FileStore/FileStoreHandler.js b/services/web/app/src/Features/FileStore/FileStoreHandler.js index 520c85538b..26769d3352 100644 --- a/services/web/app/src/Features/FileStore/FileStoreHandler.js +++ b/services/web/app/src/Features/FileStore/FileStoreHandler.js @@ -17,11 +17,11 @@ const FileStoreHandler = { uploadFileFromDisk(projectId, fileArgs, fsPath, callback) { fs.lstat(fsPath, function(err, stat) { if (err) { - logger.err({ err, projectId, fileArgs, fsPath }, 'error stating file') + logger.warn({ err, projectId, fileArgs, fsPath }, 'error stating file') callback(err) } if (!stat) { - logger.err( + logger.warn( { projectId, fileArgs, fsPath }, 'stat is not available, can not check file from disk' ) @@ -45,7 +45,7 @@ const FileStoreHandler = { ), function(err, result) { if (err) { - logger.err( + logger.warn( { err, projectId, fileArgs }, 'Error uploading file, retries failed' ) @@ -72,7 +72,7 @@ const FileStoreHandler = { ) const readStream = fs.createReadStream(fsPath) readStream.on('error', function(err) { - logger.err( + logger.warn( { err, projectId, fileId, fsPath }, 'something went wrong on the read stream of uploadFileFromDisk' ) @@ -90,7 +90,7 @@ const FileStoreHandler = { } const writeStream = request(opts) writeStream.on('error', function(err) { - logger.err( + logger.warn( { err, projectId, fileId, fsPath }, 'something went wrong on the write stream of uploadFileFromDisk' ) @@ -103,7 +103,7 @@ const FileStoreHandler = { response.statusCode }` ) - logger.err( + logger.warn( { err, statusCode: response.statusCode }, 'error uploading to filestore' ) @@ -151,7 +151,7 @@ const FileStoreHandler = { const url = this._buildUrl(projectId, fileId) request.head(url, (err, res) => { if (err) { - logger.err( + logger.warn( { err, projectId, fileId }, 'failed to get file size from filestore' ) @@ -161,7 +161,7 @@ const FileStoreHandler = { return callback(new Errors.NotFoundError('file not found in filestore')) } if (res.statusCode !== 200) { - logger.err( + logger.warn( { projectId, fileId, statusCode: res.statusCode }, 'filestore returned non-200 response' ) @@ -181,7 +181,7 @@ const FileStoreHandler = { } return request(opts, function(err, response) { if (err) { - logger.err( + logger.warn( { err, projectId, fileId }, 'something went wrong deleting file from filestore' ) @@ -208,7 +208,7 @@ const FileStoreHandler = { } return request(opts, function(err, response) { if (err) { - logger.err( + logger.warn( { err, oldProjectId, oldFileId, newProjectId, newFileId }, 'something went wrong telling filestore api to copy file' ) @@ -220,7 +220,7 @@ const FileStoreHandler = { err = new Error( `non-ok response from filestore for copyFile: ${response.statusCode}` ) - logger.err( + logger.warn( { uri: opts.uri, statusCode: response.statusCode }, 'error uploading to filestore' ) diff --git a/services/web/app/src/Features/History/HistoryController.js b/services/web/app/src/Features/History/HistoryController.js index f0d56de343..161fb17a9e 100644 --- a/services/web/app/src/Features/History/HistoryController.js +++ b/services/web/app/src/Features/History/HistoryController.js @@ -82,7 +82,7 @@ module.exports = HistoryController = { }) getReq.pipe(res) return getReq.on('error', function(error) { - logger.error({ url, err: error }, 'history API error') + logger.warn({ url, err: error }, 'history API error') return next(error) }) }, @@ -267,7 +267,7 @@ module.exports = HistoryController = { error = new Error( `history api responded with non-success code: ${response.statusCode}` ) - logger.error( + logger.warn( { err: error }, `project-history api responded with non-success code: ${ response.statusCode @@ -327,7 +327,7 @@ module.exports = HistoryController = { } return request(options, function(err, response, body) { if (err) { - logger.error({ err, v1_project_id, version }, 'history API error') + logger.warn({ err, v1_project_id, version }, 'history API error') return next(err) } let retryAttempt = 0 @@ -362,7 +362,7 @@ module.exports = HistoryController = { return callback() }) return getReq.on('error', function(err) { - logger.error( + logger.warn( { err, v1_project_id, version, retryAttempt }, 'history s3 download error' ) @@ -371,7 +371,7 @@ module.exports = HistoryController = { }, retryDelay), function(err) { if (err) { - logger.error( + logger.warn( { err, v1_project_id, version, retryAttempt }, 'history s3 download failed' ) diff --git a/services/web/app/src/Features/InactiveData/InactiveProjectManager.js b/services/web/app/src/Features/InactiveData/InactiveProjectManager.js index 14ab230422..7da377e154 100644 --- a/services/web/app/src/Features/InactiveData/InactiveProjectManager.js +++ b/services/web/app/src/Features/InactiveData/InactiveProjectManager.js @@ -27,7 +27,7 @@ module.exports = InactiveProjectManager = { project ) { if (err != null) { - logger.err({ err, project_id }, 'error getting project') + logger.warn({ err, project_id }, 'error getting project') return callback(err) } logger.log( @@ -41,7 +41,7 @@ module.exports = InactiveProjectManager = { return DocstoreManager.unarchiveProject(project_id, function(err) { if (err != null) { - logger.err( + logger.warn( { err, project_id }, 'error reactivating project in docstore' ) @@ -84,7 +84,7 @@ module.exports = InactiveProjectManager = { ) return async.series(jobs, function(err) { if (err != null) { - logger.err({ err }, 'error deactivating projects') + logger.warn({ err }, 'error deactivating projects') } return callback(err, projects) }) @@ -99,7 +99,7 @@ module.exports = InactiveProjectManager = { ] return async.series(jobs, function(err) { if (err != null) { - logger.err({ err, project_id }, 'error deactivating project') + logger.warn({ err, project_id }, 'error deactivating project') } return callback(err) }) diff --git a/services/web/app/src/Features/Institutions/InstitutionsAPI.js b/services/web/app/src/Features/Institutions/InstitutionsAPI.js index 0a2d7c9447..995f2db54c 100644 --- a/services/web/app/src/Features/Institutions/InstitutionsAPI.js +++ b/services/web/app/src/Features/Institutions/InstitutionsAPI.js @@ -83,17 +83,17 @@ module.exports = InstitutionsAPI = { return callback(error, body) } // have notifications delete any ip matcher notifications for this university - logger.log(university) return NotificationsBuilder.ipMatcherAffiliation(userId).read( university != null ? university.id : undefined, function(err) { if (err) { + // log and ignore error logger.err( { err }, 'Something went wrong marking ip notifications read' ) } - return callback(error, body) + return callback(null, body) } ) } @@ -190,7 +190,7 @@ var makeAffiliationRequest = function(requestOptions, callback) { }` } - logger.err( + logger.warn( { path: requestOptions.path, body: requestOptions.body }, errorMessage ) diff --git a/services/web/app/src/Features/Institutions/InstitutionsController.js b/services/web/app/src/Features/Institutions/InstitutionsController.js index 6d254dff7a..45f45db901 100644 --- a/services/web/app/src/Features/Institutions/InstitutionsController.js +++ b/services/web/app/src/Features/Institutions/InstitutionsController.js @@ -45,7 +45,7 @@ var affiliateUsers = function(hostname, callback) { { _id: 1, emails: 1 }, function(error, users) { if (error != null) { - logger.err({ error }, 'problem fetching users by hostname') + logger.warn({ error }, 'problem fetching users by hostname') return callback(error) } @@ -81,7 +81,7 @@ var affiliateUserByReversedHostname = function( { confirmedAt: email.confirmedAt }, error => { if (error != null) { - logger.err( + logger.warn( { error }, 'problem adding affiliation while confirming hostname' ) diff --git a/services/web/app/src/Features/Metadata/MetaController.js b/services/web/app/src/Features/Metadata/MetaController.js index 5c3065382d..64e126739c 100644 --- a/services/web/app/src/Features/Metadata/MetaController.js +++ b/services/web/app/src/Features/Metadata/MetaController.js @@ -25,7 +25,7 @@ module.exports = MetaController = { projectMeta ) { if (err != null) { - logger.err( + logger.warn( { project_id, err }, '[MetaController] error getting all labels from project' ) @@ -44,7 +44,7 @@ module.exports = MetaController = { docMeta ) { if (err != null) { - logger.err( + logger.warn( { project_id, doc_id, err }, '[MetaController] error getting labels from doc' ) diff --git a/services/web/app/src/Features/Newsletter/NewsletterManager.js b/services/web/app/src/Features/Newsletter/NewsletterManager.js index 0ed879f0ac..dc9bfe1924 100644 --- a/services/web/app/src/Features/Newsletter/NewsletterManager.js +++ b/services/web/app/src/Features/Newsletter/NewsletterManager.js @@ -47,7 +47,7 @@ module.exports = { ) return mailchimp.request(options, function(err) { if (err != null) { - logger.err({ err, user }, 'error subscribing person to newsletter') + logger.warn({ err, user }, 'error subscribing person to newsletter') } else { logger.log({ user }, 'finished subscribing user to the newsletter') } @@ -66,7 +66,7 @@ module.exports = { const options = buildOptions(user, false) return mailchimp.request(options, function(err) { if (err != null) { - logger.err({ err, user }, 'error unsubscribing person to newsletter') + logger.warn({ err, user }, 'error unsubscribing person to newsletter') } else { logger.log({ user }, 'finished unsubscribing user to the newsletter') } @@ -126,7 +126,7 @@ module.exports = { ) return callback() } else if (err != null) { - logger.err( + logger.warn( { err, oldEmail, newEmail }, 'error changing email in newsletter' ) diff --git a/services/web/app/src/Features/PasswordReset/PasswordResetController.js b/services/web/app/src/Features/PasswordReset/PasswordResetController.js index 306a8b9afe..66ae0b059b 100644 --- a/services/web/app/src/Features/PasswordReset/PasswordResetController.js +++ b/services/web/app/src/Features/PasswordReset/PasswordResetController.js @@ -143,7 +143,7 @@ module.exports = { user, function(err) { if (err != null) { - logger.err( + logger.warn( { err, email: user.email }, 'Error setting up session after setting password' ) diff --git a/services/web/app/src/Features/Project/ProjectController.js b/services/web/app/src/Features/Project/ProjectController.js index 522fe72d45..7ed756f4c1 100644 --- a/services/web/app/src/Features/Project/ProjectController.js +++ b/services/web/app/src/Features/Project/ProjectController.js @@ -189,7 +189,7 @@ module.exports = ProjectController = { projectName, function(err, project) { if (err != null) { - logger.error( + logger.warn( { err, project_id, user_id: currentUser._id }, 'error cloning project' ) @@ -358,7 +358,7 @@ module.exports = ProjectController = { }, function(err, results) { if (err != null) { - logger.err({ err }, 'error getting data for project list page') + logger.warn({ err }, 'error getting data for project list page') return next(err) } logger.log({ results, user_id }, 'rendering project list') @@ -595,7 +595,7 @@ module.exports = ProjectController = { }, function(err, results) { if (err != null) { - logger.err({ err }, 'error getting details for project page') + logger.warn({ err }, 'error getting details for project page') return next(err) } const { project } = results diff --git a/services/web/app/src/Features/Project/ProjectCreationHandler.js b/services/web/app/src/Features/Project/ProjectCreationHandler.js index 5e1b1af52f..6074844ee7 100644 --- a/services/web/app/src/Features/Project/ProjectCreationHandler.js +++ b/services/web/app/src/Features/Project/ProjectCreationHandler.js @@ -270,7 +270,7 @@ const ProjectCreationHandler = { owner_id, function(error, doc) { if (error != null) { - logger.err( + logger.warn( { err: error }, 'error adding root doc when creating project' ) diff --git a/services/web/app/src/Features/Project/ProjectDeleter.js b/services/web/app/src/Features/Project/ProjectDeleter.js index 14267067c0..78d72529cd 100644 --- a/services/web/app/src/Features/Project/ProjectDeleter.js +++ b/services/web/app/src/Features/Project/ProjectDeleter.js @@ -144,7 +144,7 @@ const ProjectDeleter = { ], function(err, deletedProject) { if (err != null) { - logger.err({ err }, 'problem deleting project') + logger.warn({ err }, 'problem deleting project') return callback(err) } logger.log( @@ -166,7 +166,7 @@ const ProjectDeleter = { { $set: { archived: true } }, function(err) { if (err != null) { - logger.err({ err }, 'problem archived project') + logger.warn({ err }, 'problem archived project') return callback(err) } logger.log( diff --git a/services/web/app/src/Features/Project/ProjectDetailsHandler.js b/services/web/app/src/Features/Project/ProjectDetailsHandler.js index a13eda8c75..110a122639 100644 --- a/services/web/app/src/Features/Project/ProjectDetailsHandler.js +++ b/services/web/app/src/Features/Project/ProjectDetailsHandler.js @@ -43,7 +43,7 @@ const ProjectDetailsHandler = { }, function(err, project) { if (err != null) { - logger.err({ err, project_id }, 'error getting project') + logger.warn({ err, project_id }, 'error getting project') return callback(err) } if (project == null) { @@ -91,7 +91,7 @@ const ProjectDetailsHandler = { ) return Project.update(conditions, update, function(err) { if (err != null) { - logger.err({ err }, 'something went wrong setting project description') + logger.warn({ err }, 'something went wrong setting project description') } return callback(err) }) @@ -184,7 +184,7 @@ const ProjectDetailsHandler = { project ) { if (err != null || project == null) { - logger.err( + logger.warn( { err, project_id }, 'error getting project or could not find it todo project rename' ) diff --git a/services/web/app/src/Features/Project/ProjectDuplicator.js b/services/web/app/src/Features/Project/ProjectDuplicator.js index ffa088f841..cfc662cae5 100644 --- a/services/web/app/src/Features/Project/ProjectDuplicator.js +++ b/services/web/app/src/Features/Project/ProjectDuplicator.js @@ -53,7 +53,7 @@ module.exports = ProjectDuplicator = { owner_id, function(err, newDoc) { if (err != null) { - logger.err({ err }, 'error copying doc') + logger.warn({ err }, 'error copying doc') return callback(err) } if ( @@ -135,7 +135,7 @@ module.exports = ProjectDuplicator = { { rootFolder: true, name: true }, function(err, newProject) { if (err != null) { - logger.err({ project_id: newProject_id }, 'could not get project') + logger.warn({ project_id: newProject_id }, 'could not get project') return callback(err) } @@ -226,7 +226,7 @@ module.exports = ProjectDuplicator = { // Get the contents of the original project first return async.series(jobs, function(err, results) { if (err != null) { - logger.err( + logger.warn( { err, originalProject_id }, 'error duplicating project reading original project' ) @@ -247,7 +247,7 @@ module.exports = ProjectDuplicator = { newProjectName, function(err, newProject) { if (err != null) { - logger.err( + logger.warn( { err, originalProject_id }, 'error duplicating project when creating new project' ) @@ -279,7 +279,7 @@ module.exports = ProjectDuplicator = { // Copy the contents of the original project into the new project return async.series(copyJobs, function(err) { if (err != null) { - logger.err( + logger.warn( { err, originalProject_id, diff --git a/services/web/app/src/Features/Project/ProjectEntityMongoUpdateHandler.js b/services/web/app/src/Features/Project/ProjectEntityMongoUpdateHandler.js index 25cb3ec80a..a666253539 100644 --- a/services/web/app/src/Features/Project/ProjectEntityMongoUpdateHandler.js +++ b/services/web/app/src/Features/Project/ProjectEntityMongoUpdateHandler.js @@ -66,7 +66,7 @@ module.exports = ProjectEntityMongoUpdateHandler = self = { { rootFolder: true, name: true, overleaf: true }, function(err, project) { if (err != null) { - logger.err({ project_id, err }, 'error getting project for add doc') + logger.warn({ project_id, err }, 'error getting project for add doc') return callback(err) } logger.log( @@ -89,7 +89,7 @@ module.exports = ProjectEntityMongoUpdateHandler = self = { { rootFolder: true, name: true, overleaf: true }, function(err, project) { if (err != null) { - logger.err({ project_id, err }, 'error getting project for add file') + logger.warn({ project_id, err }, 'error getting project for add file') return callback(err) } logger.log( @@ -336,7 +336,7 @@ module.exports = ProjectEntityMongoUpdateHandler = self = { oldFiles.length !== newFiles.length || oldDocs.length !== newDocs.length ) { - logger.err( + logger.warn( { project_id, oldDocs: oldDocs.length, @@ -509,7 +509,7 @@ module.exports = ProjectEntityMongoUpdateHandler = self = { { rootFolder: true, name: true, overleaf: true }, function(err, project) { if (err != null) { - logger.err( + logger.warn( { project_id, err }, 'error getting project for add folder' ) @@ -531,7 +531,7 @@ module.exports = ProjectEntityMongoUpdateHandler = self = { 'folder', err => { if (err != null) { - logger.err( + logger.warn( { err, project_id: project._id }, 'error adding folder to project' ) @@ -622,7 +622,7 @@ module.exports = ProjectEntityMongoUpdateHandler = self = { if (element == null || element._id == null) { e = new Error('no element passed to be inserted') - logger.err( + logger.warn( { project_id: project._id, folder_id, element, type }, 'failed trying to insert element as it was null' ) @@ -634,7 +634,7 @@ module.exports = ProjectEntityMongoUpdateHandler = self = { // check if name is allowed if (!SafePath.isCleanFilename(element.name)) { e = new Errors.InvalidNameError('invalid element name') - logger.err( + logger.warn( { project_id: project._id, folder_id, element, type }, 'failed trying to insert element as name was invalid' ) @@ -658,7 +658,7 @@ module.exports = ProjectEntityMongoUpdateHandler = self = { { project, element_id: folder_id, type: 'folders' }, (err, folder, path) => { if (err != null) { - logger.err( + logger.warn( { err, project_id: project._id, folder_id, type, element }, 'error finding folder for _putElement' ) @@ -706,7 +706,7 @@ module.exports = ProjectEntityMongoUpdateHandler = self = { { new: true }, function(err, newProject) { if (err != null) { - logger.err( + logger.warn( { err, project_id: project._id }, 'error saving in putElement project' ) diff --git a/services/web/app/src/Features/Project/ProjectEntityUpdateHandler.js b/services/web/app/src/Features/Project/ProjectEntityUpdateHandler.js index 1f290efd57..0d28f9eece 100644 --- a/services/web/app/src/Features/Project/ProjectEntityUpdateHandler.js +++ b/services/web/app/src/Features/Project/ProjectEntityUpdateHandler.js @@ -128,7 +128,7 @@ module.exports = ProjectEntityUpdateHandler = self = { fileRef._id, function(err, fileStoreUrl) { if (err != null) { - logger.err( + logger.warn( { err, project_id, @@ -182,7 +182,7 @@ module.exports = ProjectEntityUpdateHandler = self = { 'file', function(err, result, newProject) { if (err != null) { - logger.err( + logger.warn( { err, project_id, folder_id }, 'error putting element as part of copy' ) @@ -286,7 +286,7 @@ module.exports = ProjectEntityUpdateHandler = self = { if (doc == null) { // Do not allow an update to a doc which has never exist on this project - logger.error( + logger.warn( { doc_id, project_id, lines }, 'doc not found while updating doc lines' ) @@ -305,7 +305,7 @@ module.exports = ProjectEntityUpdateHandler = self = { ranges, function(err, modified, rev) { if (err != null) { - logger.error( + logger.warn( { err, doc_id, project_id, lines }, 'error sending doc to docstore' ) @@ -379,7 +379,7 @@ module.exports = ProjectEntityUpdateHandler = self = { doc, function(err, result, project) { if (err != null) { - logger.err( + logger.warn( { err, project_id, @@ -546,7 +546,7 @@ module.exports = ProjectEntityUpdateHandler = self = { fsPath, function(err, fileStoreUrl, fileRef) { if (err != null) { - logger.err( + logger.warn( { err, project_id, folder_id, file_name: fileName, fileRef }, 'error uploading image to s3' ) @@ -567,7 +567,7 @@ module.exports = ProjectEntityUpdateHandler = self = { fileRef, function(err, result, project) { if (err != null) { - logger.err( + logger.warn( { err, project_id, folder_id, file_name: fileRef.name, fileRef }, 'error adding file with project' ) @@ -1129,7 +1129,7 @@ module.exports = ProjectEntityUpdateHandler = self = { } logger.log({ entity_id, entityType, project_id }, 'deleting project entity') if (entityType == null) { - logger.err({ err: 'No entityType set', project_id, entity_id }) + logger.warn({ err: 'No entityType set', project_id, entity_id }) return callback('No entityType set') } entityType = entityType.toLowerCase() @@ -1260,7 +1260,7 @@ module.exports = ProjectEntityUpdateHandler = self = { 'moving entity' ) if (entityType == null) { - logger.err({ err: 'No entityType set', project_id, entity_id }) + logger.warn({ err: 'No entityType set', project_id, entity_id }) return callback('No entityType set') } entityType = entityType.toLowerCase() @@ -1308,7 +1308,7 @@ module.exports = ProjectEntityUpdateHandler = self = { } logger.log({ entity_id, project_id }, `renaming ${entityType}`) if (entityType == null) { - logger.err({ err: 'No entityType set', project_id, entity_id }) + logger.warn({ err: 'No entityType set', project_id, entity_id }) return callback('No entityType set') } entityType = entityType.toLowerCase() diff --git a/services/web/app/src/Features/Project/ProjectGetter.js b/services/web/app/src/Features/Project/ProjectGetter.js index 4dd6a177a4..dd2bfa2e66 100644 --- a/services/web/app/src/Features/Project/ProjectGetter.js +++ b/services/web/app/src/Features/Project/ProjectGetter.js @@ -122,7 +122,7 @@ module.exports = ProjectGetter = { return db.projects.find(query, projection, function(err, project) { if (err != null) { - logger.err({ err, query, projection }, 'error getting project') + logger.warn({ err, query, projection }, 'error getting project') return callback(err) } return callback(null, project != null ? project[0] : undefined) diff --git a/services/web/app/src/Features/Project/ProjectLocator.js b/services/web/app/src/Features/Project/ProjectLocator.js index 6c98565ffe..32b830c8a5 100644 --- a/services/web/app/src/Features/Project/ProjectLocator.js +++ b/services/web/app/src/Features/Project/ProjectLocator.js @@ -146,7 +146,7 @@ module.exports = ProjectLocator = { { rootFolder: true, rootDoc_id: true }, function(err, project) { if (err != null) { - logger.err({ err }, 'error getting project') + logger.warn({ err }, 'error getting project') return callback(err) } else { return getRootDoc(project) @@ -272,7 +272,7 @@ module.exports = ProjectLocator = { } if (typeof err !== 'undefined' && err !== null) { - logger.err( + logger.warn( { err, project_id: project._id }, 'error getting project for finding element' ) diff --git a/services/web/app/src/Features/Project/ProjectOptionsHandler.js b/services/web/app/src/Features/Project/ProjectOptionsHandler.js index 7898d47e9c..d787bd7390 100644 --- a/services/web/app/src/Features/Project/ProjectOptionsHandler.js +++ b/services/web/app/src/Features/Project/ProjectOptionsHandler.js @@ -117,7 +117,7 @@ module.exports = { const update = { $unset: { brandVariationId: 1 } } return Project.update(conditions, update, {}, function(err) { if (err != null) { - logger.err({ err }, 'error unsetting brandVariationId') + logger.warn({ err }, 'error unsetting brandVariationId') return callback(err) } return callback() diff --git a/services/web/app/src/Features/Referal/ReferalAllocator.js b/services/web/app/src/Features/Referal/ReferalAllocator.js index 2687b7e76d..1a274d0053 100644 --- a/services/web/app/src/Features/Referal/ReferalAllocator.js +++ b/services/web/app/src/Features/Referal/ReferalAllocator.js @@ -57,7 +57,7 @@ module.exports = ReferalAllocator = { {}, function(err) { if (err != null) { - logger.err( + logger.warn( { err, referal_id, new_user_id }, 'something went wrong allocating referal' ) diff --git a/services/web/app/src/Features/References/ReferencesHandler.js b/services/web/app/src/Features/References/ReferencesHandler.js index 47f4df6983..323248e9f7 100644 --- a/services/web/app/src/Features/References/ReferencesHandler.js +++ b/services/web/app/src/Features/References/ReferencesHandler.js @@ -108,7 +108,7 @@ module.exports = ReferencesHandler = { { rootFolder: true, owner_ref: 1 }, function(err, project) { if (err) { - logger.err({ err, projectId }, 'error finding project') + logger.warn({ err, projectId }, 'error finding project') return callback(err) } logger.log({ projectId }, 'indexing all bib files in project') @@ -134,7 +134,7 @@ module.exports = ReferencesHandler = { { rootFolder: true, owner_ref: 1 }, function(err, project) { if (err) { - logger.err({ err, projectId }, 'error finding project') + logger.warn({ err, projectId }, 'error finding project') return callback(err) } return ReferencesHandler._doIndexOperation( @@ -159,7 +159,7 @@ module.exports = ReferencesHandler = { } return ReferencesHandler._isFullIndex(project, function(err, isFullIndex) { if (err) { - logger.err( + logger.warn( { err, projectId }, 'error checking whether to do full index' ) @@ -176,7 +176,7 @@ module.exports = ReferencesHandler = { function(err) { // continue if (err) { - logger.err( + logger.warn( { err, projectId, docIds }, 'error flushing docs to mongo' ) @@ -203,7 +203,7 @@ module.exports = ReferencesHandler = { }, function(err, res, data) { if (err) { - logger.err( + logger.warn( { err, projectId }, 'error communicating with references api' ) diff --git a/services/web/app/src/Features/Subscription/FeaturesUpdater.js b/services/web/app/src/Features/Subscription/FeaturesUpdater.js index 353670e293..6b8cfeb8fd 100644 --- a/services/web/app/src/Features/Subscription/FeaturesUpdater.js +++ b/services/web/app/src/Features/Subscription/FeaturesUpdater.js @@ -51,7 +51,7 @@ module.exports = FeaturesUpdater = { } return async.series(jobs, function(err, results) { if (err != null) { - logger.err( + logger.warn( { err, user_id }, 'error getting subscription or group for refreshFeatures' ) diff --git a/services/web/app/src/Features/Subscription/LimitationsManager.js b/services/web/app/src/Features/Subscription/LimitationsManager.js index b7bceba911..841fa0bcd7 100644 --- a/services/web/app/src/Features/Subscription/LimitationsManager.js +++ b/services/web/app/src/Features/Subscription/LimitationsManager.js @@ -241,11 +241,11 @@ module.exports = LimitationsManager = { subscription ) { if (err != null) { - logger.err({ err, subscriptionId }, 'error getting subscription') + logger.warn({ err, subscriptionId }, 'error getting subscription') return callback(err) } if (subscription == null) { - logger.err({ subscriptionId }, 'no subscription found') + logger.warn({ subscriptionId }, 'no subscription found') return callback('no subscription found') } diff --git a/services/web/app/src/Features/Subscription/RecurlyWrapper.js b/services/web/app/src/Features/Subscription/RecurlyWrapper.js index 858055525f..9d4d87f9aa 100644 --- a/services/web/app/src/Features/Subscription/RecurlyWrapper.js +++ b/services/web/app/src/Features/Subscription/RecurlyWrapper.js @@ -49,7 +49,7 @@ module.exports = RecurlyWrapper = { }, function(error, response, responseBody) { if (error) { - logger.error( + logger.warn( { error, user_id: user._id, recurly_token_id }, 'error response from recurly while checking account' ) @@ -73,7 +73,7 @@ module.exports = RecurlyWrapper = { account ) { if (err) { - logger.error( + logger.warn( { err, user_id: user._id, recurly_token_id }, 'error parsing account' ) @@ -131,7 +131,7 @@ module.exports = RecurlyWrapper = { }, (error, response, responseBody) => { if (error) { - logger.error( + logger.warn( { error, user_id: user._id, recurly_token_id }, 'error response from recurly while creating account' ) @@ -142,7 +142,7 @@ module.exports = RecurlyWrapper = { account ) { if (err) { - logger.error( + logger.warn( { err, user_id: user._id, recurly_token_id }, 'error creating account' ) @@ -179,7 +179,7 @@ module.exports = RecurlyWrapper = { }, (error, response, responseBody) => { if (error) { - logger.error( + logger.warn( { error, user_id: user._id, recurly_token_id }, 'error response from recurly while creating billing info' ) @@ -190,7 +190,7 @@ module.exports = RecurlyWrapper = { billingInfo ) { if (err) { - logger.error( + logger.warn( { err, user_id: user._id, accountCode, recurly_token_id }, 'error creating billing info' ) @@ -242,7 +242,7 @@ module.exports = RecurlyWrapper = { }, (error, response, responseBody) => { if (error) { - logger.error( + logger.warn( { error, user_id: user._id, recurly_token_id }, 'error response from recurly while setting address' ) @@ -253,7 +253,7 @@ module.exports = RecurlyWrapper = { billingInfo ) { if (err) { - logger.error( + logger.warn( { err, user_id: user._id, recurly_token_id }, 'error updating billing info' ) @@ -291,7 +291,7 @@ module.exports = RecurlyWrapper = { }, (error, response, responseBody) => { if (error) { - logger.error( + logger.warn( { error, user_id: user._id, recurly_token_id }, 'error response from recurly while creating subscription' ) @@ -302,7 +302,7 @@ module.exports = RecurlyWrapper = { subscription ) { if (err) { - logger.error( + logger.warn( { err, user_id: user._id, recurly_token_id }, 'error creating subscription' ) @@ -340,7 +340,7 @@ module.exports = RecurlyWrapper = { ], function(err, result) { if (err) { - logger.error( + logger.warn( { err, user_id: user._id, recurly_token_id }, 'error in paypal subscription creation process' ) @@ -348,7 +348,7 @@ module.exports = RecurlyWrapper = { } if (!result.subscription) { err = new Error('no subscription object in result') - logger.error( + logger.warn( { err, user_id: user._id, recurly_token_id }, 'error in paypal subscription creation process' ) @@ -431,7 +431,7 @@ module.exports = RecurlyWrapper = { response.statusCode !== 204 && (response.statusCode !== 404 || !expect404) ) { - logger.err( + logger.warn( { err: error, body, @@ -545,7 +545,7 @@ module.exports = RecurlyWrapper = { } return RecurlyWrapper._parseXml(body, function(err, data) { if (err != null) { - logger.err({ err }, 'could not get accoutns') + logger.warn({ err }, 'could not get accoutns') callback(err) } allAccounts = allAccounts.concat(data.accounts) @@ -699,7 +699,7 @@ module.exports = RecurlyWrapper = { }, (error, response, responseBody) => { if (error != null) { - logger.err({ err: error, coupon_code }, 'error creating coupon') + logger.warn({ err: error, coupon_code }, 'error creating coupon') } return callback(error) } @@ -785,7 +785,7 @@ module.exports = RecurlyWrapper = { }, (error, response, responseBody) => { if (error != null) { - logger.err( + logger.warn( { err: error, account_code, coupon_code }, 'error redeeming coupon' ) @@ -812,7 +812,7 @@ module.exports = RecurlyWrapper = { }, (error, response, responseBody) => { if (error != null) { - logger.err( + logger.warn( { err: error, subscriptionId, daysUntilExpire }, 'error exending trial' ) diff --git a/services/web/app/src/Features/Subscription/SubscriptionController.js b/services/web/app/src/Features/Subscription/SubscriptionController.js index 9ddc31b327..94f050dc84 100644 --- a/services/web/app/src/Features/Subscription/SubscriptionController.js +++ b/services/web/app/src/Features/Subscription/SubscriptionController.js @@ -223,7 +223,7 @@ module.exports = SubscriptionController = { recurly_token_id, function(err) { if (err != null) { - logger.err( + logger.warn( { err, user_id: user._id }, 'something went wrong creating subscription' ) @@ -259,7 +259,7 @@ module.exports = SubscriptionController = { logger.log({ user_id: user._id }, 'canceling subscription') return SubscriptionHandler.cancelSubscription(user, function(err) { if (err != null) { - logger.err( + logger.warn( { err, user_id: user._id }, 'something went wrong canceling subscription' ) @@ -283,7 +283,7 @@ module.exports = SubscriptionController = { logger.log({ user_id }, 'canceling v1 subscription') return V1SubscriptionManager.cancelV1Subscription(user_id, function(err) { if (err != null) { - logger.err( + logger.warn( { err, user_id }, 'something went wrong canceling v1 subscription' ) @@ -300,7 +300,7 @@ module.exports = SubscriptionController = { const planCode = req.body.plan_code if (planCode == null) { const err = new Error('plan_code is not defined') - logger.err( + logger.warn( { user_id: user._id, err, planCode, origin: _origin, body: req.body }, '[Subscription] error in updateSubscription form' ) @@ -313,7 +313,7 @@ module.exports = SubscriptionController = { null, function(err) { if (err != null) { - logger.err( + logger.warn( { err, user_id: user._id }, 'something went wrong updating subscription' ) @@ -329,7 +329,7 @@ module.exports = SubscriptionController = { logger.log({ user_id: user._id }, 'reactivating subscription') return SubscriptionHandler.reactivateSubscription(user, function(err) { if (err != null) { - logger.err( + logger.warn( { err, user_id: user._id }, 'something went wrong reactivating subscription' ) @@ -414,7 +414,7 @@ module.exports = SubscriptionController = { coupon_code, function(err) { if (err != null) { - logger.err({ err, user_id: user._id }, 'error updating subscription') + logger.warn({ err, user_id: user._id }, 'error updating subscription') return next(err) } return res.sendStatus(200) diff --git a/services/web/app/src/Features/Subscription/SubscriptionGroupController.js b/services/web/app/src/Features/Subscription/SubscriptionGroupController.js index 13fcf8797e..53b6da44ce 100644 --- a/services/web/app/src/Features/Subscription/SubscriptionGroupController.js +++ b/services/web/app/src/Features/Subscription/SubscriptionGroupController.js @@ -31,7 +31,7 @@ module.exports = { userToRemove_id, function(err) { if (err != null) { - logger.err( + logger.warn( { err, subscriptionId: subscription._id, userToRemove_id }, 'error removing user from group' ) diff --git a/services/web/app/src/Features/Subscription/SubscriptionUpdater.js b/services/web/app/src/Features/Subscription/SubscriptionUpdater.js index 1cf14219cf..aa29105454 100644 --- a/services/web/app/src/Features/Subscription/SubscriptionUpdater.js +++ b/services/web/app/src/Features/Subscription/SubscriptionUpdater.js @@ -117,7 +117,7 @@ const SubscriptionUpdater = { const removeOperation = { $pull: { member_ids: userId } } Subscription.updateMany(filter, removeOperation, function(err) { if (err != null) { - logger.err( + logger.warn( { err, filter, removeOperation }, 'error removing user from groups' ) diff --git a/services/web/app/src/Features/SudoMode/SudoModeController.js b/services/web/app/src/Features/SudoMode/SudoModeController.js index 1b6a0f7294..61d86e178d 100644 --- a/services/web/app/src/Features/SudoMode/SudoModeController.js +++ b/services/web/app/src/Features/SudoMode/SudoModeController.js @@ -29,7 +29,7 @@ module.exports = SudoModeController = { logger.log({ userId }, '[SudoMode] rendering sudo mode password page') return SudoModeHandler.isSudoModeActive(userId, function(err, isActive) { if (err != null) { - logger.err( + logger.warn( { err, userId }, '[SudoMode] error checking if sudo mode is active' ) @@ -66,12 +66,12 @@ module.exports = SudoModeController = { userRecord ) { if (err != null) { - logger.err({ err, userId }, '[SudoMode] error getting user') + logger.warn({ err, userId }, '[SudoMode] error getting user') return next(err) } if (userRecord == null) { err = new Error('user not found') - logger.err({ err, userId }, '[SudoMode] user not found') + logger.warn({ err, userId }, '[SudoMode] user not found') return next(err) } return SudoModeHandler.authenticate(userRecord.email, password, function( @@ -79,7 +79,7 @@ module.exports = SudoModeController = { user ) { if (err != null) { - logger.err({ err, userId }, '[SudoMode] error authenticating user') + logger.warn({ err, userId }, '[SudoMode] error authenticating user') return next(err) } if (user != null) { @@ -89,7 +89,7 @@ module.exports = SudoModeController = { ) return SudoModeHandler.activateSudoMode(userId, function(err) { if (err != null) { - logger.err( + logger.warn( { err, userId }, '[SudoMode] error activating sudo mode' ) diff --git a/services/web/app/src/Features/SudoMode/SudoModeMiddleware.js b/services/web/app/src/Features/SudoMode/SudoModeMiddleware.js index 67a52f139b..b86ae9d51f 100644 --- a/services/web/app/src/Features/SudoMode/SudoModeMiddleware.js +++ b/services/web/app/src/Features/SudoMode/SudoModeMiddleware.js @@ -33,7 +33,7 @@ module.exports = SudoModeMiddleware = { ) return SudoModeHandler.isSudoModeActive(userId, function(err, isActive) { if (err != null) { - logger.err( + logger.warn( { err, userId }, '[SudoMode] error checking if sudo mode is active' ) diff --git a/services/web/app/src/Features/Tags/TagsHandler.js b/services/web/app/src/Features/Tags/TagsHandler.js index 1feac4509d..fa049823e4 100644 --- a/services/web/app/src/Features/Tags/TagsHandler.js +++ b/services/web/app/src/Features/Tags/TagsHandler.js @@ -168,7 +168,7 @@ module.exports = TagsHandler = { _handleResponse(err, res, params, callback) { if (err != null) { params.err = err - logger.err(params, 'error in tag api') + logger.warn(params, 'error in tag api') return callback(err) } else if (res != null && res.statusCode >= 200 && res.statusCode < 300) { return callback(null) @@ -179,7 +179,7 @@ module.exports = TagsHandler = { }` ) params.err = err - logger.err( + logger.warn( params, `tags api returned failure status code: ${ res != null ? res.statusCode : undefined diff --git a/services/web/app/src/Features/Templates/TemplatesManager.js b/services/web/app/src/Features/Templates/TemplatesManager.js index 61f9ac3348..ab35af787a 100644 --- a/services/web/app/src/Features/Templates/TemplatesManager.js +++ b/services/web/app/src/Features/Templates/TemplatesManager.js @@ -46,7 +46,7 @@ module.exports = TemplatesManager = { } }) zipReq.on('error', function(err) { - logger.error({ err }, 'error getting zip from template API') + logger.warn({ err }, 'error getting zip from template API') return callback(err) }) return FileWriter.ensureDumpFolderExists(function(err) { @@ -63,7 +63,7 @@ module.exports = TemplatesManager = { } writeStream.on('close', function() { if (zipReq.response.statusCode !== 200) { - logger.err( + logger.warn( { uri: zipUrl, statusCode: zipReq.response.statusCode }, 'non-success code getting zip from template API' ) @@ -76,7 +76,7 @@ module.exports = TemplatesManager = { attributes, function(err, project) { if (err != null) { - logger.err({ err, zipReq }, 'problem building project from zip') + logger.warn({ err, zipReq }, 'problem building project from zip') return callback(err) } return async.series( diff --git a/services/web/app/src/Features/ThirdPartyDataStore/TpdsUpdateSender.js b/services/web/app/src/Features/ThirdPartyDataStore/TpdsUpdateSender.js index 60a8247113..ca901049fc 100644 --- a/services/web/app/src/Features/ThirdPartyDataStore/TpdsUpdateSender.js +++ b/services/web/app/src/Features/ThirdPartyDataStore/TpdsUpdateSender.js @@ -83,7 +83,7 @@ module.exports = TpdsUpdateSender = { allUserIds ) { if (err != null) { - logger.err({ err, options }, 'error getting projects user ids') + logger.warn({ err, options }, 'error getting projects user ids') return callback(err) } logger.log( @@ -117,7 +117,7 @@ module.exports = TpdsUpdateSender = { postOptions, function(err) { if (err != null) { - logger.err( + logger.warn( { err, project_id: options.project_id, diff --git a/services/web/app/src/Features/ThirdPartyDataStore/UpdateMerger.js b/services/web/app/src/Features/ThirdPartyDataStore/UpdateMerger.js index dae021d7c0..7f6a9903a9 100644 --- a/services/web/app/src/Features/ThirdPartyDataStore/UpdateMerger.js +++ b/services/web/app/src/Features/ThirdPartyDataStore/UpdateMerger.js @@ -143,7 +143,7 @@ module.exports = UpdateMerger = { docLines ) { if (err != null) { - logger.err( + logger.warn( { project_id }, 'error reading file into text array for process doc update' ) @@ -192,7 +192,7 @@ module.exports = UpdateMerger = { content = '' } if (error != null) { - logger.err({ path }, 'error reading file into text array') + logger.warn({ path }, 'error reading file into text array') return callback(error) } const lines = content.split(/\r\n|\n|\r/) diff --git a/services/web/app/src/Features/TokenAccess/TokenAccessController.js b/services/web/app/src/Features/TokenAccess/TokenAccessController.js index 626e0026f4..12bda2b969 100644 --- a/services/web/app/src/Features/TokenAccess/TokenAccessController.js +++ b/services/web/app/src/Features/TokenAccess/TokenAccessController.js @@ -31,7 +31,7 @@ module.exports = TokenAccessController = { userId, function(err, project) { if (err != null) { - logger.err( + logger.warn( { err, token, userId }, '[TokenAccess] error finding project with higher access' ) @@ -66,7 +66,7 @@ module.exports = TokenAccessController = { projectExists ) { if (err != null) { - logger.err( + logger.warn( { err, token, userId }, '[TokenAccess] error getting project by readAndWrite token' ) @@ -143,7 +143,7 @@ module.exports = TokenAccessController = { project._id, function(err) { if (err != null) { - logger.err( + logger.warn( { err, token, userId, projectId: project._id }, '[TokenAccess] error adding user to project with readAndWrite token' ) @@ -185,7 +185,7 @@ module.exports = TokenAccessController = { projectExists ) { if (err != null) { - logger.err( + logger.warn( { err, token, userId }, '[TokenAccess] error getting project by readOnly token' ) @@ -258,7 +258,7 @@ module.exports = TokenAccessController = { project._id, function(err) { if (err != null) { - logger.err( + logger.warn( { err, token, userId, projectId: project._id }, '[TokenAccess] error adding user to project with readAndWrite token' ) diff --git a/services/web/app/src/Features/Uploads/ArchiveManager.js b/services/web/app/src/Features/Uploads/ArchiveManager.js index 1b33458969..a97e8a6d10 100644 --- a/services/web/app/src/Features/Uploads/ArchiveManager.js +++ b/services/web/app/src/Features/Uploads/ArchiveManager.js @@ -57,7 +57,10 @@ const ArchiveManager = { // no more entries to read return zipfile.on('end', function() { if (totalSizeInBytes == null || isNaN(totalSizeInBytes)) { - logger.err({ source, totalSizeInBytes }, 'error getting bytes of zip') + logger.warn( + { source, totalSizeInBytes }, + 'error getting bytes of zip' + ) return callback(new Error('error getting bytes of zip')) } const isTooLarge = totalSizeInBytes > ONE_MEG * 300 @@ -158,7 +161,7 @@ const ArchiveManager = { destFile, function(err) { if (err != null) { - logger.error( + logger.warn( { err, source, destFile }, 'error unzipping file entry' ) @@ -191,7 +194,7 @@ const ArchiveManager = { return ArchiveManager._isZipTooLarge(source, function(err, isTooLarge) { if (err != null) { - logger.err({ err }, 'error checking size of zip file') + logger.warn({ err }, 'error checking size of zip file') return callback(err) } @@ -207,7 +210,7 @@ const ArchiveManager = { ) { timer.done() if (err != null) { - logger.error({ err, source, destination }, 'unzip failed') + logger.warn({ err, source, destination }, 'unzip failed') return callback(err) } else { return callback() diff --git a/services/web/app/src/Features/Uploads/FileSystemImportManager.js b/services/web/app/src/Features/Uploads/FileSystemImportManager.js index b8b658662e..007c98dfa6 100644 --- a/services/web/app/src/Features/Uploads/FileSystemImportManager.js +++ b/services/web/app/src/Features/Uploads/FileSystemImportManager.js @@ -301,7 +301,7 @@ module.exports = FileSystemImportManager = { } return fs.lstat(path, function(err, stat) { if (err != null) { - logger.err({ err }, 'error with path symlink check') + logger.warn({ err }, 'error with path symlink check') return callback(err) } const isSafe = stat.isFile() || stat.isDirectory() diff --git a/services/web/app/src/Features/User/UserController.js b/services/web/app/src/Features/User/UserController.js index f0df4b9868..cc76ee194e 100644 --- a/services/web/app/src/Features/User/UserController.js +++ b/services/web/app/src/Features/User/UserController.js @@ -60,7 +60,7 @@ module.exports = UserController = { password, function(err, user) { if (err != null) { - logger.err( + logger.warn( { user_id }, 'error authenticating during attempt to delete account' ) @@ -78,7 +78,7 @@ module.exports = UserController = { if (err instanceof Errors.SubscriptionAdminDeletionError) { return res.status(422).json({ error: err.name }) } else { - logger.err({ user_id }, 'error while deleting user account') + logger.warn({ user_id }, 'error while deleting user account') return next(err) } } @@ -88,7 +88,7 @@ module.exports = UserController = { } return req.session.destroy(function(err) { if (err != null) { - logger.err({ err }, 'error destorying session') + logger.warn({ err }, 'error destorying session') return next(err) } UserSessionsManager.untrackSession(user, sessionId) @@ -238,7 +238,7 @@ module.exports = UserController = { } // passport logout return req.session.destroy(function(err) { if (err) { - logger.err({ err }, 'error destorying session') + logger.warn({ err }, 'error destorying session') cb(err) } if (user != null) { diff --git a/services/web/app/src/Features/User/UserDeleter.js b/services/web/app/src/Features/User/UserDeleter.js index c83ca3c875..18797806ba 100644 --- a/services/web/app/src/Features/User/UserDeleter.js +++ b/services/web/app/src/Features/User/UserDeleter.js @@ -33,7 +33,7 @@ module.exports = UserDeleter = { callback = function(err) {} } if (user_id == null) { - logger.err('user_id is null when trying to delete user') + logger.warn('user_id is null when trying to delete user') return callback(new Error('no user_id')) } return User.findById(user_id, function(err, user) { @@ -64,7 +64,7 @@ module.exports = UserDeleter = { callback = function() {} } if (user_id == null) { - logger.err('user_id is null when trying to delete user') + logger.warn('user_id is null when trying to delete user') return callback('no user_id') } return User.findById(user_id, function(err, user) { @@ -81,7 +81,7 @@ module.exports = UserDeleter = { ], function(err) { if (err != null) { - logger.err( + logger.warn( { err, user_id }, 'something went wrong deleteing the user' ) diff --git a/services/web/app/src/Features/User/UserPagesController.js b/services/web/app/src/Features/User/UserPagesController.js index 00fbad2c48..932029a922 100644 --- a/services/web/app/src/Features/User/UserPagesController.js +++ b/services/web/app/src/Features/User/UserPagesController.js @@ -177,7 +177,7 @@ module.exports = UserPagesController = { [req.sessionID], function(err, sessions) { if (err != null) { - logger.err({ user_id: user._id }, 'error getting all user sessions') + logger.warn({ user_id: user._id }, 'error getting all user sessions') return next(err) } return res.render('user/sessions', { diff --git a/services/web/app/src/Features/User/UserSessionsManager.js b/services/web/app/src/Features/User/UserSessionsManager.js index f07de5c30e..52765c7635 100644 --- a/services/web/app/src/Features/User/UserSessionsManager.js +++ b/services/web/app/src/Features/User/UserSessionsManager.js @@ -48,7 +48,7 @@ module.exports = UserSessionsManager = { .expire(sessionSetKey, `${Settings.cookieSessionLength}`) .exec(function(err, response) { if (err != null) { - logger.err( + logger.warn( { err, user_id: user._id, sessionSetKey }, 'error while adding session key to UserSessions set' ) @@ -80,7 +80,7 @@ module.exports = UserSessionsManager = { .expire(sessionSetKey, `${Settings.cookieSessionLength}`) .exec(function(err, response) { if (err != null) { - logger.err( + logger.warn( { err, user_id: user._id, sessionSetKey }, 'error while removing session key from UserSessions set' ) @@ -99,7 +99,7 @@ module.exports = UserSessionsManager = { const sessionSetKey = UserSessionsRedis.sessionSetKey(user) return rclient.smembers(sessionSetKey, function(err, sessionKeys) { if (err != null) { - logger.err( + logger.warn( { user_id: user._id }, 'error getting all session keys for user from redis' ) @@ -116,7 +116,7 @@ module.exports = UserSessionsManager = { (k, cb) => rclient.get(k, cb), function(err, sessions) { if (err != null) { - logger.err( + logger.warn( { user_id: user._id }, 'error getting all sessions for user from redis' ) @@ -163,7 +163,7 @@ module.exports = UserSessionsManager = { const sessionSetKey = UserSessionsRedis.sessionSetKey(user) return rclient.smembers(sessionSetKey, function(err, sessionKeys) { if (err != null) { - logger.err( + logger.warn( { err, user_id: user._id, sessionSetKey }, 'error getting contents of UserSessions set' ) @@ -189,7 +189,7 @@ module.exports = UserSessionsManager = { return Async.series(deletions, function(err, _result) { if (err != null) { - logger.err( + logger.warn( { err, user_id: user._id, sessionSetKey }, 'errror revoking all sessions for user' ) @@ -197,7 +197,7 @@ module.exports = UserSessionsManager = { } return rclient.srem(sessionSetKey, keysToDelete, function(err) { if (err != null) { - logger.err( + logger.warn( { err, user_id: user._id, sessionSetKey }, 'error removing session set for user' ) @@ -223,7 +223,7 @@ module.exports = UserSessionsManager = { `${Settings.cookieSessionLength}`, function(err, response) { if (err != null) { - logger.err( + logger.warn( { err, user_id: user._id }, 'error while updating ttl on UserSessions set' ) @@ -246,7 +246,7 @@ module.exports = UserSessionsManager = { const sessionSetKey = UserSessionsRedis.sessionSetKey(user) return rclient.smembers(sessionSetKey, function(err, sessionKeys) { if (err != null) { - logger.err( + logger.warn( { err, user_id: user._id, sessionSetKey }, 'error getting contents of UserSessions set' ) diff --git a/services/web/app/src/Features/User/UserUpdater.js b/services/web/app/src/Features/User/UserUpdater.js index 50d2850889..3a2f466780 100644 --- a/services/web/app/src/Features/User/UserUpdater.js +++ b/services/web/app/src/Features/User/UserUpdater.js @@ -99,7 +99,10 @@ module.exports = UserUpdater = { return addAffiliation(userId, newEmail, affiliationOptions, error => { if (error != null) { - logger.err({ error }, 'problem adding affiliation while adding email') + logger.warn( + { error }, + 'problem adding affiliation while adding email' + ) return callback(error) } @@ -115,7 +118,7 @@ module.exports = UserUpdater = { } return this.updateUser(userId, update, function(error) { if (error != null) { - logger.err({ error }, 'problem updating users emails') + logger.warn({ error }, 'problem updating users emails') return callback(error) } return callback() @@ -133,7 +136,7 @@ module.exports = UserUpdater = { } return removeAffiliation(userId, email, error => { if (error != null) { - logger.err({ error }, 'problem removing affiliation') + logger.warn({ error }, 'problem removing affiliation') return callback(error) } @@ -141,7 +144,7 @@ module.exports = UserUpdater = { const update = { $pull: { emails: { email } } } return this.updateUser(query, update, function(error, res) { if (error != null) { - logger.err({ error }, 'problem removing users email') + logger.warn({ error }, 'problem removing users email') return callback(error) } if (res.n === 0) { @@ -167,7 +170,7 @@ module.exports = UserUpdater = { const update = { $set: { email } } return this.updateUser(query, update, function(error, res) { if (error != null) { - logger.err({ error }, 'problem setting default emails') + logger.warn({ error }, 'problem setting default emails') return callback(error) } else if (res.n === 0) { // TODO: Check n or nMatched? @@ -277,7 +280,7 @@ module.exports = UserUpdater = { logger.log({ userId, email }, 'confirming user email') return addAffiliation(userId, email, { confirmedAt }, error => { if (error != null) { - logger.err( + logger.warn( { error }, 'problem adding affiliation while confirming email' ) diff --git a/services/web/app/src/Features/UserMembership/UserMembershipAuthorization.js b/services/web/app/src/Features/UserMembership/UserMembershipAuthorization.js index b102dafe25..c2f6269538 100644 --- a/services/web/app/src/Features/UserMembership/UserMembershipAuthorization.js +++ b/services/web/app/src/Features/UserMembership/UserMembershipAuthorization.js @@ -141,7 +141,7 @@ module.exports = UserMembershipAuthorization = { } if (response.statusCode !== 200) { - logger.err( + logger.warn( { templateId }, "[TemplateMetrics] Couldn't fetch template data from v1" ) diff --git a/services/web/app/src/Features/V1/V1Handler.js b/services/web/app/src/Features/V1/V1Handler.js index dc0bdecd7f..ad7d361246 100644 --- a/services/web/app/src/Features/V1/V1Handler.js +++ b/services/web/app/src/Features/V1/V1Handler.js @@ -32,7 +32,7 @@ module.exports = V1Handler = { }, function(err, response, body) { if (err != null) { - logger.err( + logger.warn( { email, err }, '[V1Handler] error while talking to v1 login api' ) @@ -80,7 +80,7 @@ module.exports = V1Handler = { }, function(err, response, body) { if (err != null) { - logger.err( + logger.warn( { v1_user_id, err }, 'error while talking to v1 password reset api' ) diff --git a/services/web/app/src/infrastructure/FileWriter.js b/services/web/app/src/infrastructure/FileWriter.js index 043a64fade..abef439046 100644 --- a/services/web/app/src/infrastructure/FileWriter.js +++ b/services/web/app/src/infrastructure/FileWriter.js @@ -76,14 +76,14 @@ module.exports = FileWriter = { stream.pipe(writeStream) stream.on('error', function(err) { - logger.err( + logger.warn( { err, identifier, fsPath }, '[writeStreamToDisk] something went wrong with incoming stream' ) return callback(err) }) writeStream.on('error', function(err) { - logger.err( + logger.warn( { err, identifier, fsPath }, '[writeStreamToDisk] something went wrong with writing to disk' ) @@ -110,7 +110,7 @@ module.exports = FileWriter = { return FileWriter.writeStreamToDisk(identifier, stream, callback) } else { const err = new Error(`bad response from url: ${response.statusCode}`) - logger.err({ err, identifier, url }, err.message) + logger.warn({ err, identifier, url }, err.message) return callback(err) } }) diff --git a/services/web/app/src/infrastructure/GeoIpLookup.js b/services/web/app/src/infrastructure/GeoIpLookup.js index 55d9312fdc..06db3ecea3 100644 --- a/services/web/app/src/infrastructure/GeoIpLookup.js +++ b/services/web/app/src/infrastructure/GeoIpLookup.js @@ -76,7 +76,7 @@ module.exports = GeoIpLookup = { logger.log({ ip, opts }, 'getting geo ip details') return request.get(opts, function(err, res, ipDetails) { if (err != null) { - logger.err({ err, ip }, 'error getting ip details') + logger.warn({ err, ip }, 'error getting ip details') } return callback(err, ipDetails) }) diff --git a/services/web/app/src/infrastructure/LockManager.js b/services/web/app/src/infrastructure/LockManager.js index 4342a2ea31..c59495beb8 100644 --- a/services/web/app/src/infrastructure/LockManager.js +++ b/services/web/app/src/infrastructure/LockManager.js @@ -203,7 +203,7 @@ module.exports = LockManager = { return callback(err) } else if (result != null && result !== 1) { // successful unlock should release exactly one key - logger.error( + logger.warn( { key, lockValue, redis_err: err, redis_result: result }, 'unlocking error' ) diff --git a/services/web/test/unit/src/Authentication/AuthenticationControllerTests.js b/services/web/test/unit/src/Authentication/AuthenticationControllerTests.js index 66756e7958..8808ba6567 100644 --- a/services/web/test/unit/src/Authentication/AuthenticationControllerTests.js +++ b/services/web/test/unit/src/Authentication/AuthenticationControllerTests.js @@ -48,6 +48,7 @@ describe('AuthenticationController', function() { }), 'logger-sharelatex': (this.logger = { log: sinon.stub(), + warn: sinon.stub(), error: sinon.stub(), err: sinon.stub() }), diff --git a/services/web/test/unit/src/BetaProgram/BetaProgramControllerTests.js b/services/web/test/unit/src/BetaProgram/BetaProgramControllerTests.js index 195e575883..47ab7ee521 100644 --- a/services/web/test/unit/src/BetaProgram/BetaProgramControllerTests.js +++ b/services/web/test/unit/src/BetaProgram/BetaProgramControllerTests.js @@ -50,6 +50,7 @@ describe('BetaProgramController', function() { }), 'logger-sharelatex': (this.logger = { log: sinon.stub(), + warn: sinon.stub(), err: sinon.stub(), error: sinon.stub() }), diff --git a/services/web/test/unit/src/BetaProgram/BetaProgramHandlerTests.js b/services/web/test/unit/src/BetaProgram/BetaProgramHandlerTests.js index 76f1fa1809..ffaf9720c0 100644 --- a/services/web/test/unit/src/BetaProgram/BetaProgramHandlerTests.js +++ b/services/web/test/unit/src/BetaProgram/BetaProgramHandlerTests.js @@ -41,6 +41,7 @@ describe('BetaProgramHandler', function() { }, 'logger-sharelatex': (this.logger = { log: sinon.stub(), + warn: sinon.stub(), err: sinon.stub() }), 'metrics-sharelatex': (this.logger = { diff --git a/services/web/test/unit/src/BrandVariations/BrandVariationsHandlerTests.js b/services/web/test/unit/src/BrandVariations/BrandVariationsHandlerTests.js index 61ce2022e7..22e9f287a2 100644 --- a/services/web/test/unit/src/BrandVariations/BrandVariationsHandlerTests.js +++ b/services/web/test/unit/src/BrandVariations/BrandVariationsHandlerTests.js @@ -32,6 +32,7 @@ describe('BrandVariationsHandler', function() { } } this.logger = { + warn() {}, err() {}, log() {} } diff --git a/services/web/test/unit/src/Chat/ChatApiHandlerTests.js b/services/web/test/unit/src/Chat/ChatApiHandlerTests.js index 2378245a5b..316a264b4b 100644 --- a/services/web/test/unit/src/Chat/ChatApiHandlerTests.js +++ b/services/web/test/unit/src/Chat/ChatApiHandlerTests.js @@ -34,7 +34,11 @@ describe('ChatApiHandler', function() { this.ChatApiHandler = SandboxedModule.require(modulePath, { requires: { 'settings-sharelatex': this.settings, - 'logger-sharelatex': { log: sinon.stub(), error: sinon.stub() }, + 'logger-sharelatex': { + log: sinon.stub(), + warn: sinon.stub(), + error: sinon.stub() + }, request: this.request } }) diff --git a/services/web/test/unit/src/Collaborators/CollaboratorsControllerTests.js b/services/web/test/unit/src/Collaborators/CollaboratorsControllerTests.js index b132735e03..bc8b84cf9e 100644 --- a/services/web/test/unit/src/Collaborators/CollaboratorsControllerTests.js +++ b/services/web/test/unit/src/Collaborators/CollaboratorsControllerTests.js @@ -31,7 +31,7 @@ describe('CollaboratorsController', function() { '../Tags/TagsHandler': (this.TagsHandler = {}), 'logger-sharelatex': (this.logger = { err: sinon.stub(), - erro: sinon.stub(), + warn: sinon.stub(), log: sinon.stub() }) } diff --git a/services/web/test/unit/src/Collaborators/CollaboratorsHandlerTests.js b/services/web/test/unit/src/Collaborators/CollaboratorsHandlerTests.js index 7144e26478..38811126b5 100644 --- a/services/web/test/unit/src/Collaborators/CollaboratorsHandlerTests.js +++ b/services/web/test/unit/src/Collaborators/CollaboratorsHandlerTests.js @@ -32,6 +32,7 @@ describe('CollaboratorsHandler', function() { requires: { 'logger-sharelatex': (this.logger = { log: sinon.stub(), + warn: sinon.stub(), err: sinon.stub() }), '../User/UserCreator': (this.UserCreator = {}), diff --git a/services/web/test/unit/src/Collaborators/CollaboratorsInviteControllerTests.js b/services/web/test/unit/src/Collaborators/CollaboratorsInviteControllerTests.js index 64496d9032..26438df3d0 100644 --- a/services/web/test/unit/src/Collaborators/CollaboratorsInviteControllerTests.js +++ b/services/web/test/unit/src/Collaborators/CollaboratorsInviteControllerTests.js @@ -53,6 +53,7 @@ describe('CollaboratorsInviteController', function() { 'logger-sharelatex': (this.logger = { err: sinon.stub(), error: sinon.stub(), + warn: sinon.stub(), log: sinon.stub() }), '../Editor/EditorRealTimeController': (this.EditorRealTimeController = { diff --git a/services/web/test/unit/src/Collaborators/CollaboratorsInviteHandlerTests.js b/services/web/test/unit/src/Collaborators/CollaboratorsInviteHandlerTests.js index 27aec6b6fa..2107313ad9 100644 --- a/services/web/test/unit/src/Collaborators/CollaboratorsInviteHandlerTests.js +++ b/services/web/test/unit/src/Collaborators/CollaboratorsInviteHandlerTests.js @@ -60,6 +60,7 @@ describe('CollaboratorsInviteHandler', function() { 'logger-sharelatex': (this.logger = { err: sinon.stub(), error: sinon.stub(), + warn: sinon.stub(), log: sinon.stub() }), './CollaboratorsEmailHandler': (this.CollaboratorsEmailHandler = {}), diff --git a/services/web/test/unit/src/Contact/ContactManagerTests.js b/services/web/test/unit/src/Contact/ContactManagerTests.js index 35b1b27d13..5ef67fdfc9 100644 --- a/services/web/test/unit/src/Contact/ContactManagerTests.js +++ b/services/web/test/unit/src/Contact/ContactManagerTests.js @@ -29,6 +29,7 @@ describe('ContactManager', function() { }), 'logger-sharelatex': (this.logger = { log: sinon.stub(), + warn: sinon.stub(), error: sinon.stub(), err() {} }) @@ -99,7 +100,7 @@ describe('ContactManager', function() { }) it('should log the error', function() { - return this.logger.error + return this.logger.warn .calledWith( { err: new Error( @@ -167,7 +168,7 @@ describe('ContactManager', function() { }) it('should log the error', function() { - return this.logger.error + return this.logger.warn .calledWith( { err: new Error( diff --git a/services/web/test/unit/src/Docstore/DocstoreManagerTests.js b/services/web/test/unit/src/Docstore/DocstoreManagerTests.js index 8a2867dc8d..a8716de2ac 100644 --- a/services/web/test/unit/src/Docstore/DocstoreManagerTests.js +++ b/services/web/test/unit/src/Docstore/DocstoreManagerTests.js @@ -33,6 +33,7 @@ describe('DocstoreManager', function() { }), 'logger-sharelatex': (this.logger = { log: sinon.stub(), + warn: sinon.stub(), error: sinon.stub(), err() {} }) @@ -95,7 +96,7 @@ describe('DocstoreManager', function() { }) it('should log the error', function() { - return this.logger.error + return this.logger.warn .calledWith( { err: new Error( @@ -131,7 +132,7 @@ describe('DocstoreManager', function() { }) it('should log the error', function() { - return this.logger.error + return this.logger.warn .calledWith( { err: new Errors.NotFoundError( @@ -222,7 +223,7 @@ describe('DocstoreManager', function() { }) it('should log the error', function() { - return this.logger.error + return this.logger.warn .calledWith( { err: new Error( @@ -299,7 +300,7 @@ describe('DocstoreManager', function() { }) it('should log the error', function() { - return this.logger.error + return this.logger.warn .calledWith( { err: new Error( @@ -364,7 +365,7 @@ describe('DocstoreManager', function() { }) it('should log the error', function() { - return this.logger.error + return this.logger.warn .calledWith( { err: new Errors.NotFoundError('doc not found in docstore'), @@ -425,7 +426,7 @@ describe('DocstoreManager', function() { }) it('should log the error', function() { - return this.logger.error + return this.logger.warn .calledWith( { err: new Error( @@ -487,7 +488,7 @@ describe('DocstoreManager', function() { }) it('should log the error', function() { - return this.logger.error + return this.logger.warn .calledWith( { err: new Error( diff --git a/services/web/test/unit/src/Documents/DocumentControllerTests.js b/services/web/test/unit/src/Documents/DocumentControllerTests.js index 5d0a59f50d..cf51877ea3 100644 --- a/services/web/test/unit/src/Documents/DocumentControllerTests.js +++ b/services/web/test/unit/src/Documents/DocumentControllerTests.js @@ -28,6 +28,7 @@ describe('DocumentController', function() { requires: { 'logger-sharelatex': { log() {}, + warn() {}, err() {} }, '../Project/ProjectGetter': (this.ProjectGetter = {}), diff --git a/services/web/test/unit/src/Exports/ExportsHandlerTests.js b/services/web/test/unit/src/Exports/ExportsHandlerTests.js index a78b677f3f..62306d4020 100644 --- a/services/web/test/unit/src/Exports/ExportsHandlerTests.js +++ b/services/web/test/unit/src/Exports/ExportsHandlerTests.js @@ -30,6 +30,7 @@ describe('ExportsHandler', function() { requires: { 'logger-sharelatex': { log() {}, + warn() {}, err() {} }, '../Project/ProjectGetter': (this.ProjectGetter = {}), diff --git a/services/web/test/unit/src/FileStore/FileStoreHandlerTests.js b/services/web/test/unit/src/FileStore/FileStoreHandlerTests.js index fa89f8f84d..3b16a1a97a 100644 --- a/services/web/test/unit/src/FileStore/FileStoreHandlerTests.js +++ b/services/web/test/unit/src/FileStore/FileStoreHandlerTests.js @@ -56,6 +56,7 @@ describe('FileStoreHandler', function() { } this.logger = { log: sinon.stub(), + warn: sinon.stub(), err: sinon.stub() } this.FileHashManager = { diff --git a/services/web/test/unit/src/History/HistoryControllerTests.js b/services/web/test/unit/src/History/HistoryControllerTests.js index b27bfac5cc..d1e18ca93b 100644 --- a/services/web/test/unit/src/History/HistoryControllerTests.js +++ b/services/web/test/unit/src/History/HistoryControllerTests.js @@ -31,6 +31,7 @@ describe('HistoryController', function() { 'settings-sharelatex': (this.settings = {}), 'logger-sharelatex': (this.logger = { log: sinon.stub(), + warn: sinon.stub(), error: sinon.stub() }), '../Authentication/AuthenticationController': this diff --git a/services/web/test/unit/src/InactiveData/InactiveProjectManagerTests.js b/services/web/test/unit/src/InactiveData/InactiveProjectManagerTests.js index 8a73608057..a71ac7bc9e 100644 --- a/services/web/test/unit/src/InactiveData/InactiveProjectManagerTests.js +++ b/services/web/test/unit/src/InactiveData/InactiveProjectManagerTests.js @@ -40,6 +40,7 @@ describe('InactiveProjectManager', function() { 'settings-sharelatex': this.settings, 'logger-sharelatex': { log() {}, + warn() {}, err() {} }, '../Docstore/DocstoreManager': this.DocstoreManager, diff --git a/services/web/test/unit/src/Institutions/InstitutionsAPITests.js b/services/web/test/unit/src/Institutions/InstitutionsAPITests.js index 41e96f7cdd..a4d6f55a8b 100644 --- a/services/web/test/unit/src/Institutions/InstitutionsAPITests.js +++ b/services/web/test/unit/src/Institutions/InstitutionsAPITests.js @@ -24,7 +24,7 @@ const modulePath = path.join( describe('InstitutionsAPI', function() { beforeEach(function() { - this.logger = { err: sinon.stub(), log() {} } + this.logger = { warn: sinon.stub(), err: sinon.stub(), log() {} } this.settings = { apis: { v1: { url: 'v1.url', user: '', pass: '' } } } this.request = sinon.stub() this.ipMatcherNotification = { diff --git a/services/web/test/unit/src/Institutions/InstitutionsControllerTests.js b/services/web/test/unit/src/Institutions/InstitutionsControllerTests.js index 133a7526a3..16cc92dfa7 100644 --- a/services/web/test/unit/src/Institutions/InstitutionsControllerTests.js +++ b/services/web/test/unit/src/Institutions/InstitutionsControllerTests.js @@ -23,7 +23,7 @@ const { expect } = require('chai') describe('InstitutionsController', function() { beforeEach(function() { - this.logger = { err: sinon.stub(), log() {} } + this.logger = { err: sinon.stub(), warn: sinon.stub(), log() {} } this.host = 'mit.edu' .split('') .reverse() diff --git a/services/web/test/unit/src/Metadata/MetaControllerTests.js b/services/web/test/unit/src/Metadata/MetaControllerTests.js index 73c40d6a59..433b1abfba 100644 --- a/services/web/test/unit/src/Metadata/MetaControllerTests.js +++ b/services/web/test/unit/src/Metadata/MetaControllerTests.js @@ -28,7 +28,11 @@ describe('MetaController', function() { } return (this.MetadataController = SandboxedModule.require(modulePath, { requires: { - 'logger-sharelatex': { log: sinon.stub(), err: sinon.stub() }, + 'logger-sharelatex': { + log: sinon.stub(), + warn: sinon.stub(), + err: sinon.stub() + }, '../Editor/EditorRealTimeController': this.EditorRealTimeController, './MetaHandler': this.MetaHandler } diff --git a/services/web/test/unit/src/Project/ProjectDetailsHandlerTests.js b/services/web/test/unit/src/Project/ProjectDetailsHandlerTests.js index 5981350fca..55912c480e 100644 --- a/services/web/test/unit/src/Project/ProjectDetailsHandlerTests.js +++ b/services/web/test/unit/src/Project/ProjectDetailsHandlerTests.js @@ -63,6 +63,7 @@ describe('ProjectDetailsHandler', function() { '../Collaborators/CollaboratorsHandler': this.CollaboratorsHandler, 'logger-sharelatex': { log() {}, + warn() {}, err() {} }, './ProjectTokenGenerator': (this.ProjectTokenGenerator = {}), diff --git a/services/web/test/unit/src/Project/ProjectDuplicatorTests.js b/services/web/test/unit/src/Project/ProjectDuplicatorTests.js index a9e1641f33..13f4ec52f2 100644 --- a/services/web/test/unit/src/Project/ProjectDuplicatorTests.js +++ b/services/web/test/unit/src/Project/ProjectDuplicatorTests.js @@ -161,6 +161,7 @@ describe('ProjectDuplicator', function() { './ProjectGetter': this.ProjectGetter, 'logger-sharelatex': { log() {}, + warn() {}, err() {} } } diff --git a/services/web/test/unit/src/Project/ProjectEntityMongoUpdateHandlerTests.js b/services/web/test/unit/src/Project/ProjectEntityMongoUpdateHandlerTests.js index e711df1761..cf116f0c98 100644 --- a/services/web/test/unit/src/Project/ProjectEntityMongoUpdateHandlerTests.js +++ b/services/web/test/unit/src/Project/ProjectEntityMongoUpdateHandlerTests.js @@ -51,6 +51,7 @@ describe('ProjectEntityMongoUpdateHandler', function() { requires: { 'logger-sharelatex': (this.logger = { log: sinon.stub(), + warn: sinon.stub(), error: sinon.stub(), err() {} }), diff --git a/services/web/test/unit/src/Project/ProjectEntityUpdateHandlerTests.js b/services/web/test/unit/src/Project/ProjectEntityUpdateHandlerTests.js index a556789b05..26aee5ae20 100644 --- a/services/web/test/unit/src/Project/ProjectEntityUpdateHandlerTests.js +++ b/services/web/test/unit/src/Project/ProjectEntityUpdateHandlerTests.js @@ -88,6 +88,7 @@ describe('ProjectEntityUpdateHandler', function() { requires: { 'logger-sharelatex': (this.logger = { log: sinon.stub(), + warn: sinon.stub(), error: sinon.stub(), err() {} }), @@ -446,7 +447,7 @@ describe('ProjectEntityUpdateHandler', function() { }) it('should log out the error', function() { - return this.logger.error + return this.logger.warn .calledWith( { project_id, diff --git a/services/web/test/unit/src/References/ReferencesHandlerTests.js b/services/web/test/unit/src/References/ReferencesHandlerTests.js index 53a04c61e6..dbb42ae0af 100644 --- a/services/web/test/unit/src/References/ReferencesHandlerTests.js +++ b/services/web/test/unit/src/References/ReferencesHandlerTests.js @@ -51,6 +51,7 @@ describe('ReferencesHandler', function() { requires: { 'logger-sharelatex': { log() {}, + warn() {}, err() {} }, 'settings-sharelatex': (this.settings = { diff --git a/services/web/test/unit/src/Subscription/RecurlyWrapperTests.js b/services/web/test/unit/src/Subscription/RecurlyWrapperTests.js index 188235f4fd..bc182c9936 100644 --- a/services/web/test/unit/src/Subscription/RecurlyWrapperTests.js +++ b/services/web/test/unit/src/Subscription/RecurlyWrapperTests.js @@ -149,6 +149,7 @@ describe('RecurlyWrapper', function() { 'logger-sharelatex': { err: sinon.stub(), error: sinon.stub(), + warn: sinon.stub(), log: sinon.stub() }, request: sinon.stub(), diff --git a/services/web/test/unit/src/Subscription/SubscriptionUpdaterTests.js b/services/web/test/unit/src/Subscription/SubscriptionUpdaterTests.js index c9a94e34b4..652a57b2c0 100644 --- a/services/web/test/unit/src/Subscription/SubscriptionUpdaterTests.js +++ b/services/web/test/unit/src/Subscription/SubscriptionUpdaterTests.js @@ -104,7 +104,8 @@ describe('SubscriptionUpdater', function() { '../User/UserGetter': this.UserGetter, './PlansLocator': this.PlansLocator, 'logger-sharelatex': { - log() {} + log() {}, + warn() {} }, 'settings-sharelatex': this.Settings, './FeaturesUpdater': this.FeaturesUpdater diff --git a/services/web/test/unit/src/SudoMode/SudoModeControllerTests.js b/services/web/test/unit/src/SudoMode/SudoModeControllerTests.js index 95698ccbd1..8f3546a252 100644 --- a/services/web/test/unit/src/SudoMode/SudoModeControllerTests.js +++ b/services/web/test/unit/src/SudoMode/SudoModeControllerTests.js @@ -37,7 +37,11 @@ describe('SudoModeController', function() { this.UserGetter = { getUser: sinon.stub() } return (this.SudoModeController = SandboxedModule.require(modulePath, { requires: { - 'logger-sharelatex': { log: sinon.stub(), err: sinon.stub() }, + 'logger-sharelatex': { + log: sinon.stub(), + warn: sinon.stub(), + err: sinon.stub() + }, './SudoModeHandler': this.SudoModeHandler, '../Authentication/AuthenticationController': this .AuthenticationController, diff --git a/services/web/test/unit/src/SudoMode/SudoModeMiddlewareTests.js b/services/web/test/unit/src/SudoMode/SudoModeMiddlewareTests.js index e6dba72592..290b6995b1 100644 --- a/services/web/test/unit/src/SudoMode/SudoModeMiddlewareTests.js +++ b/services/web/test/unit/src/SudoMode/SudoModeMiddlewareTests.js @@ -33,7 +33,11 @@ describe('SudoModeMiddleware', function() { './SudoModeHandler': this.SudoModeHandler, '../Authentication/AuthenticationController': this .AuthenticationController, - 'logger-sharelatex': { log: sinon.stub(), err: sinon.stub() }, + 'logger-sharelatex': { + log: sinon.stub(), + warn: sinon.stub(), + err: sinon.stub() + }, 'settings-sharelatex': (this.Settings = {}) } })) diff --git a/services/web/test/unit/src/Tags/TagsHandlerTests.js b/services/web/test/unit/src/Tags/TagsHandlerTests.js index ffffe20017..a0fb7eebde 100644 --- a/services/web/test/unit/src/Tags/TagsHandlerTests.js +++ b/services/web/test/unit/src/Tags/TagsHandlerTests.js @@ -43,6 +43,7 @@ describe('TagsHandler', function() { request: this.request, 'logger-sharelatex': { log() {}, + warn() {}, err() {} } } diff --git a/services/web/test/unit/src/TokenAccess/TokenAccessControllerTests.js b/services/web/test/unit/src/TokenAccess/TokenAccessControllerTests.js index d86a8e4901..531f769c61 100644 --- a/services/web/test/unit/src/TokenAccess/TokenAccessControllerTests.js +++ b/services/web/test/unit/src/TokenAccess/TokenAccessControllerTests.js @@ -57,7 +57,11 @@ describe('TokenAccessController', function() { '../../infrastructure/Features': (this.Features = { hasFeature: sinon.stub().returns(false) }), - 'logger-sharelatex': { log: sinon.stub(), err: sinon.stub() }, + 'logger-sharelatex': { + log: sinon.stub(), + warn: sinon.stub(), + err: sinon.stub() + }, 'settings-sharelatex': { overleaf: { host: 'http://overleaf.test:5000' diff --git a/services/web/test/unit/src/Uploads/ArchiveManagerTests.js b/services/web/test/unit/src/Uploads/ArchiveManagerTests.js index cf85dc7c77..d9b56e3843 100644 --- a/services/web/test/unit/src/Uploads/ArchiveManagerTests.js +++ b/services/web/test/unit/src/Uploads/ArchiveManagerTests.js @@ -116,7 +116,7 @@ describe('ArchiveManager', function() { }) it('should log out the error', function() { - return this.logger.error.called.should.equal(true) + return this.logger.warn.called.should.equal(true) }) }) @@ -167,7 +167,7 @@ describe('ArchiveManager', function() { }) it('should log out the error', function() { - return this.logger.error.called.should.equal(true) + return this.logger.warn.called.should.equal(true) }) }) @@ -317,7 +317,7 @@ describe('ArchiveManager', function() { }) it('should log out the error', function() { - return this.logger.error.called.should.equal(true) + return this.logger.warn.called.should.equal(true) }) it('should close the zipfile', function() { @@ -355,7 +355,7 @@ describe('ArchiveManager', function() { }) it('should log out the error', function() { - return this.logger.error.called.should.equal(true) + return this.logger.warn.called.should.equal(true) }) it('should close the zipfile', function() { @@ -395,7 +395,7 @@ describe('ArchiveManager', function() { }) it('should log out the error', function() { - return this.logger.error.called.should.equal(true) + return this.logger.warn.called.should.equal(true) }) it('should unpipe from the readstream', function() { diff --git a/services/web/test/unit/src/User/UserControllerTests.js b/services/web/test/unit/src/User/UserControllerTests.js index 1216e3b9c2..2d04e61ffb 100644 --- a/services/web/test/unit/src/User/UserControllerTests.js +++ b/services/web/test/unit/src/User/UserControllerTests.js @@ -94,6 +94,7 @@ describe('UserController', function() { 'settings-sharelatex': this.settings, 'logger-sharelatex': { log() {}, + warn() {}, err() {} }, 'metrics-sharelatex': { diff --git a/services/web/test/unit/src/User/UserDeleterTests.js b/services/web/test/unit/src/User/UserDeleterTests.js index db7703bcc9..db8d50676a 100644 --- a/services/web/test/unit/src/User/UserDeleterTests.js +++ b/services/web/test/unit/src/User/UserDeleterTests.js @@ -78,6 +78,7 @@ describe('UserDeleter', function() { '../../infrastructure/mongojs': this.mongojs, 'logger-sharelatex': (this.logger = { log: sinon.stub(), + warn: sinon.stub(), err: sinon.stub() }), '../Errors/Errors': Errors diff --git a/services/web/test/unit/src/User/UserPagesControllerTests.js b/services/web/test/unit/src/User/UserPagesControllerTests.js index 9fd09b8d40..beae0e1279 100644 --- a/services/web/test/unit/src/User/UserPagesControllerTests.js +++ b/services/web/test/unit/src/User/UserPagesControllerTests.js @@ -64,6 +64,7 @@ describe('UserPagesController', function() { 'settings-sharelatex': this.settings, 'logger-sharelatex': { log() {}, + warn() {}, err() {} }, './UserGetter': this.UserGetter, diff --git a/services/web/test/unit/src/User/UserSessionsManagerTests.js b/services/web/test/unit/src/User/UserSessionsManagerTests.js index 4d7805bd81..7543f92a1a 100644 --- a/services/web/test/unit/src/User/UserSessionsManagerTests.js +++ b/services/web/test/unit/src/User/UserSessionsManagerTests.js @@ -54,6 +54,7 @@ describe('UserSessionsManager', function() { this.logger = { err: sinon.stub(), error: sinon.stub(), + warn: sinon.stub(), log: sinon.stub() } this.settings = { diff --git a/services/web/test/unit/src/User/UserUpdaterTests.js b/services/web/test/unit/src/User/UserUpdaterTests.js index 0010044b22..3acef2bdf1 100644 --- a/services/web/test/unit/src/User/UserUpdaterTests.js +++ b/services/web/test/unit/src/User/UserUpdaterTests.js @@ -39,7 +39,7 @@ describe('UserUpdater', function() { this.logger = { err: sinon.stub(), log() {}, - warn() {} + warn: sinon.stub() } this.addAffiliation = sinon.stub().yields() this.removeAffiliation = sinon.stub().callsArgWith(2, null) @@ -195,7 +195,7 @@ describe('UserUpdater', function() { this.stubbedUser._id, this.newEmail, err => { - this.logger.err.called.should.equal(true) + this.logger.warn.called.should.equal(true) should.exist(err) return done() } diff --git a/services/web/test/unit/src/UserMembership/UserMembershipAuthorizationTests.js b/services/web/test/unit/src/UserMembership/UserMembershipAuthorizationTests.js index d7418f84f3..b940af3ef6 100644 --- a/services/web/test/unit/src/UserMembership/UserMembershipAuthorizationTests.js +++ b/services/web/test/unit/src/UserMembership/UserMembershipAuthorizationTests.js @@ -55,6 +55,7 @@ describe('UserMembershipAuthorization', function() { request: (this.request = sinon.stub().yields(null, null, {})), 'logger-sharelatex': { log() {}, + warn() {}, err() {} } }