From a79adcd325add5cf704b028780d49dbc0eb4164c Mon Sep 17 00:00:00 2001 From: Jakob Ackermann Date: Thu, 2 May 2019 01:26:35 +0200 Subject: [PATCH] [logging] do not overwrite the logger name Signed-off-by: Jakob Ackermann --- .../app/coffee/FSPersistorManager.coffee | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/services/filestore/app/coffee/FSPersistorManager.coffee b/services/filestore/app/coffee/FSPersistorManager.coffee index 353e2ef099..ef3effbaf2 100644 --- a/services/filestore/app/coffee/FSPersistorManager.coffee +++ b/services/filestore/app/coffee/FSPersistorManager.coffee @@ -44,10 +44,10 @@ module.exports = getFileStream: (location, name, opts, _callback = (err, res)->) -> callback = _.once _callback filteredName = filterName name - logger.log location:location, name:filteredName, "getting file" + logger.log location:location, filteredName:filteredName, "getting file" sourceStream = fs.createReadStream "#{location}/#{filteredName}", opts sourceStream.on 'error', (err) -> - logger.err err:err, location:location, name:name, "Error reading from file" + logger.err err:err, location:location, filteredName:name, "Error reading from file" if err.code == 'ENOENT' return callback new Errors.NotFoundError(err.message), null else @@ -76,10 +76,10 @@ module.exports = deleteFile: (location, name, callback)-> filteredName = filterName name - logger.log location:location, name:filteredName, "delete file" + logger.log location:location, filteredName:filteredName, "delete file" fs.unlink "#{location}/#{filteredName}", (err) -> if err? - logger.err err:err, location:location, name:filteredName, "Error on delete." + logger.err err:err, location:location, filteredName:filteredName, "Error on delete." callback err else callback() @@ -88,24 +88,24 @@ module.exports = filteredName = filterName name.replace(/\/$/,'') rimraf "#{location}/#{filteredName}", (err) -> if err? - logger.err err:err, location:location, name:filteredName, "Error on rimraf rmdir." + logger.err err:err, location:location, filteredName:filteredName, "Error on rimraf rmdir." callback err else callback() checkIfFileExists:(location, name, callback = (err,exists)->)-> filteredName = filterName name - logger.log location:location, name:filteredName, "checking if file exists" + logger.log location:location, filteredName:filteredName, "checking if file exists" fs.exists "#{location}/#{filteredName}", (exists) -> - logger.log location:location, name:filteredName, exists:exists, "checked if file exists" + logger.log location:location, filteredName:filteredName, exists:exists, "checked if file exists" callback null, exists directorySize:(location, name, callback)-> filteredName = filterName name.replace(/\/$/,'') - logger.log location:location, name:filteredName, "get project size in file system" + logger.log location:location, filteredName:filteredName, "get project size in file system" fs.readdir "#{location}/#{filteredName}", (err, files) -> if err? - logger.err err:err, location:location, name:filteredName, "something went wrong listing prefix in aws" + logger.err err:err, location:location, filteredName:filteredName, "something went wrong listing prefix in aws" return callback(err) totalSize = 0 _.each files, (entry)->