Просмотр исходного кода

log FS delete errors only on failure

Brian Gough 12 лет назад
Родитель
Сommit
72ebaea5e2
1 измененных файлов с 6 добавлено и 3 удалено
  1. 6 3
      services/filestore/app/coffee/FSPersistorManager.coffee

+ 6 - 3
services/filestore/app/coffee/FSPersistorManager.coffee

@@ -59,13 +59,16 @@ module.exports =
     filteredName = filterName name
     filteredName = filterName name
     logger.log location:location, name:filteredName, "delete file"
     logger.log location:location, name:filteredName, "delete file"
     fs.unlink "#{location}/#{filteredName}", (err) ->
     fs.unlink "#{location}/#{filteredName}", (err) ->
-      logger.err err:err, location:location, name:filteredName, "Error on delete."
-      callback err
+      if err?
+        logger.err err:err, location:location, name:filteredName, "Error on delete."
+        callback err
+      else
+        callback()
 
 
   deleteDirectory: (location, name, callback = (err)->)->
   deleteDirectory: (location, name, callback = (err)->)->
     filteredName = filterName name.replace(/\/$/,'')
     filteredName = filterName name.replace(/\/$/,'')
     rimraf "#{location}/#{filteredName}", (err) ->
     rimraf "#{location}/#{filteredName}", (err) ->
-      if err
+      if err?
         logger.err err:err, location:location, name:filteredName, "Error on rimraf rmdir."
         logger.err err:err, location:location, name:filteredName, "Error on rimraf rmdir."
         callback err
         callback err
       else
       else