From a9be97622b37f39b2b709d191401f23a767705d2 Mon Sep 17 00:00:00 2001 From: c4live Date: Thu, 5 Jun 2014 10:31:05 +0200 Subject: [PATCH 1/4] Update FileHandler.coffee: ignore any error that happens while deleting directory during insertFile. --- services/filestore/app/coffee/FileHandler.coffee | 1 - 1 file changed, 1 deletion(-) diff --git a/services/filestore/app/coffee/FileHandler.coffee b/services/filestore/app/coffee/FileHandler.coffee index 8968470300..795460629a 100644 --- a/services/filestore/app/coffee/FileHandler.coffee +++ b/services/filestore/app/coffee/FileHandler.coffee @@ -12,7 +12,6 @@ module.exports = insertFile: (bucket, key, stream, callback)-> convetedKey = KeyBuilder.getConvertedFolderKey(key) PersistorManager.deleteDirectory bucket, convetedKey, (error) -> - return callback(error) if error? PersistorManager.sendStream bucket, key, stream, callback deleteFile: (bucket, key, callback)-> From 1e42221954fcaec1a28aaecde6dbf1c2eb3f8132 Mon Sep 17 00:00:00 2001 From: c4live Date: Thu, 5 Jun 2014 14:10:05 +0200 Subject: [PATCH 2/4] Update FSPersistorManager.coffee Do not propagate the error if trying to delete a directory that does not exist. --- services/filestore/app/coffee/FSPersistorManager.coffee | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/services/filestore/app/coffee/FSPersistorManager.coffee b/services/filestore/app/coffee/FSPersistorManager.coffee index 032d4edb29..992a9b25be 100644 --- a/services/filestore/app/coffee/FSPersistorManager.coffee +++ b/services/filestore/app/coffee/FSPersistorManager.coffee @@ -60,7 +60,10 @@ module.exports = filteredName = filterName name fs.rmdir "#{location}/#{filteredName}", (err) -> logger.err err:err, location:location, name:filteredName, "Error on rmdir." - callback err + if err and err.errno != 34 + callback err + else + callback() checkIfFileExists:(location, name, callback = (err,exists)->)-> filteredName = filterName name From 5bc89c3cbfca0fa9de05720e6579f3ed0b7926e6 Mon Sep 17 00:00:00 2001 From: c4live Date: Thu, 5 Jun 2014 14:10:49 +0200 Subject: [PATCH 3/4] Update FileHandler.coffee Restoring error check. --- services/filestore/app/coffee/FileHandler.coffee | 1 + 1 file changed, 1 insertion(+) diff --git a/services/filestore/app/coffee/FileHandler.coffee b/services/filestore/app/coffee/FileHandler.coffee index 795460629a..8968470300 100644 --- a/services/filestore/app/coffee/FileHandler.coffee +++ b/services/filestore/app/coffee/FileHandler.coffee @@ -12,6 +12,7 @@ module.exports = insertFile: (bucket, key, stream, callback)-> convetedKey = KeyBuilder.getConvertedFolderKey(key) PersistorManager.deleteDirectory bucket, convetedKey, (error) -> + return callback(error) if error? PersistorManager.sendStream bucket, key, stream, callback deleteFile: (bucket, key, callback)-> From 408bf43b985bd5fdc3798b89a87f0e1a06c63160 Mon Sep 17 00:00:00 2001 From: c4live Date: Thu, 5 Jun 2014 16:01:38 +0200 Subject: [PATCH 4/4] Update FSPersistorManager.coffee Using code 'ENOENT' for error checking instead of errno 34. --- services/filestore/app/coffee/FSPersistorManager.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/filestore/app/coffee/FSPersistorManager.coffee b/services/filestore/app/coffee/FSPersistorManager.coffee index 992a9b25be..cbdad516d6 100644 --- a/services/filestore/app/coffee/FSPersistorManager.coffee +++ b/services/filestore/app/coffee/FSPersistorManager.coffee @@ -60,7 +60,7 @@ module.exports = filteredName = filterName name fs.rmdir "#{location}/#{filteredName}", (err) -> logger.err err:err, location:location, name:filteredName, "Error on rmdir." - if err and err.errno != 34 + if err and err.code != 'ENOENT' callback err else callback()