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

improved logging

Browse source
This commit is contained in:
Henry Oswald 2014-02-17 16:31:33 +00:00
parent 110e623a0d
commit 7501046ebc
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
services/filestore/app/coffee/LocalFileWriter.coffee
View file

@ -8,7 +8,6 @@ metrics = require("./metrics")
module.exports = module.exports =
writeStream: (stream, key, callback)-> writeStream: (stream, key, callback)->
timer = new metrics.Timer("writingFile") timer = new metrics.Timer("writingFile")
callback = _.once callback callback = _.once callback
fsPath = @_getPath(key) fsPath = @_getPath(key)

11
services/filestore/app/coffee/s3Wrapper.coffee
View file

@ -32,6 +32,9 @@ module.exports =
if err? if err?
logger.err err:err, bucketName:bucketName, key:key, fsPath:fsPath,"something went wrong uploading file to s3" logger.err err:err, bucketName:bucketName, key:key, fsPath:fsPath,"something went wrong uploading file to s3"
return callback(err) return callback(err)
if !res?
logger.err err:err, res:res, bucketName:bucketName, key:key, fsPath:fsPath, "no response from s3 put file"
callback("no response from put file")
if res.statusCode != 200 if res.statusCode != 200
logger.err bucketName:bucketName, key:key, fsPath:fsPath, "non 200 response from s3 putting file" 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") return callback("non 200 response from s3 on put file")
@ -58,7 +61,7 @@ module.exports =
options = buildDefaultOptions(bucketName, "get", key) options = buildDefaultOptions(bucketName, "get", key)
readStream = request(options) readStream = request(options)
readStream.on "error", (err)-> readStream.on "error", (err)->
logger.err bucketName:bucketName, key:key, "error getting file stream from s3" logger.err err:err, bucketName:bucketName, key:key, "error getting file stream from s3"
callback null, readStream callback null, readStream
copyFile: (bucketName, sourceKey, destKey, callback)-> copyFile: (bucketName, sourceKey, destKey, callback)->
@ -69,7 +72,7 @@ module.exports =
bucket: bucketName bucket: bucketName
s3Client.copyFile sourceKey, destKey, (err)-> s3Client.copyFile sourceKey, destKey, (err)->
if err? if err?
logger.err bucketName:bucketName, sourceKey:sourceKey, destKey:destKey, "something went wrong copying file in aws" logger.err err:err, bucketName:bucketName, sourceKey:sourceKey, destKey:destKey, "something went wrong copying file in aws"
callback(err) callback(err)
deleteFile: (bucketName, key, callback)-> deleteFile: (bucketName, key, callback)->
@ -77,7 +80,7 @@ module.exports =
options = buildDefaultOptions(bucketName, "delete", key) options = buildDefaultOptions(bucketName, "delete", key)
request options, (err, res)-> request options, (err, res)->
if err? if err?
logger.err res:res, bucketName:bucketName, key:key, "something went wrong deleting file in aws" logger.err err:err, res:res, bucketName:bucketName, key:key, "something went wrong deleting file in aws"
callback(err) callback(err)
deleteDirectory: (bucketName, key, callback)-> deleteDirectory: (bucketName, key, callback)->
@ -95,7 +98,7 @@ module.exports =
options = buildDefaultOptions(bucketName, "head", key) options = buildDefaultOptions(bucketName, "head", key)
request options, (err, res)-> request options, (err, res)->
if err? if err?
logger.err res:res, bucketName:bucketName, key:key, "something went wrong copying file in aws" logger.err err:err, res:res, bucketName:bucketName, key:key, "something went wrong copying file in aws"
exists = res.statusCode == 200 exists = res.statusCode == 200
logger.log bucketName:bucketName, key:key, exists:exists, "checked if file exsists in s3" logger.log bucketName:bucketName, key:key, exists:exists, "checked if file exsists in s3"
callback(err, exists) callback(err, exists)