github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-07 20:31:06 -05:00
Code Issues Projects Releases Packages Wiki Activity

Tidy up testing/logging

Browse source
This commit is contained in:
James Allen 2014-06-02 17:25:40 +01:00
parent e17aaba3ba
commit df6b5132c2
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
services/filestore/app/coffee/S3PersistorManager.coffee
View file

@ -49,9 +49,9 @@ module.exports =
if res.statusCode != 200
logger.err bucketName:bucketName, key:key, fsPath:fsPath, "non 200 response from s3 putting file"
return callback("non 200 response from s3 on put file")
#LocalFileWriter.deleteFile fsPath, (err)->
logger.log res:res, bucketName:bucketName, key:key, fsPath:fsPath,"file uploaded to s3"
callback(err)
LocalFileWriter.deleteFile fsPath, (err)->
logger.log res:res, bucketName:bucketName, key:key, fsPath:fsPath,"file uploaded to s3"
callback(err)
putEventEmiter.on "error", (err)->
logger.err err:err, bucketName:bucketName, key:key, fsPath:fsPath, "error emmited on put of file"
callback err
@ -101,9 +101,10 @@ module.exports =
callback(err)
deleteDirectory: (bucketName, key, _callback)->
# deleteMultiple can call the callback multiple times so protect against this.
callback = (args...) ->
logger.log key: key, bucketName: bucketName, args: args, "calling delete callback"
_callback(args...)
_callback = () ->
logger.log key: key, bucketName: bucketName, "deleting directory"
s3Client = knox.createClient
@ -111,7 +112,6 @@ module.exports =
secret: settings.filestore.s3.secret
bucket: bucketName
s3Client.list prefix:key, (err, data)->
logger.log data: data, key: key, bucketName: bucketName, "got file list"
keys = _.map data.Contents, (entry)->
return entry.Key
s3Client.deleteMultiple keys, callback