From d92c3e8b55b58ca95f3296074a5a486ca2407ba3 Mon Sep 17 00:00:00 2001 From: James Allen Date: Thu, 1 Mar 2018 11:32:05 +0000 Subject: [PATCH] Logging and error message tweaks --- .../Features/LinkedFiles/LinkedFilesController.coffee | 1 + .../web/app/coffee/Features/LinkedFiles/UrlAgent.coffee | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/services/web/app/coffee/Features/LinkedFiles/LinkedFilesController.coffee b/services/web/app/coffee/Features/LinkedFiles/LinkedFilesController.coffee index e2320d148a..aaf4172cf4 100644 --- a/services/web/app/coffee/Features/LinkedFiles/LinkedFilesController.coffee +++ b/services/web/app/coffee/Features/LinkedFiles/LinkedFilesController.coffee @@ -24,6 +24,7 @@ module.exports = LinkedFilesController = { linkedFileData.provider = provider Agent.writeIncomingFileToDisk project_id, linkedFileData, user_id, (error, fsPath) -> if error? + logger.error {err: error, project_id, name, linkedFileData, parent_folder_id, user_id}, 'error writing linked file to disk' return Agent.handleError(error, req, res, next) EditorController.upsertFile project_id, parent_folder_id, name, fsPath, linkedFileData, "upload", user_id, (error) -> return next(error) if error? diff --git a/services/web/app/coffee/Features/LinkedFiles/UrlAgent.coffee b/services/web/app/coffee/Features/LinkedFiles/UrlAgent.coffee index cb80108826..ad96aa628f 100644 --- a/services/web/app/coffee/Features/LinkedFiles/UrlAgent.coffee +++ b/services/web/app/coffee/Features/LinkedFiles/UrlAgent.coffee @@ -31,15 +31,15 @@ module.exports = UrlAgent = { callback = _.once(callback) url = data.url if !urlValidator.isWebUri(url) - return callback(new InvalidUrlError()) - url = @._wrapWithProxy(url) + return callback(new InvalidUrlError("invalid url: #{url}")) + url = UrlAgent._wrapWithProxy(url) readStream = request.get(url) readStream.on "error", callback readStream.on "response", (response) -> if 200 <= response.statusCode < 300 FileWriter.writeStreamToDisk project_id, readStream, callback else - error = new UrlFetchFailedError() + error = new UrlFetchFailedError("url fetch failed: #{url}") error.statusCode = response.statusCode callback(error)