소스 검색

Refactor, and log when we have a 'range' header.

Shane Kilkelly 11 년 전
부모
커밋
8a631e70f7
1개의 변경된 파일과 6개의 추가작업 그리고 5개의 파일을 삭제
  1. 6 5
      services/filestore/app/coffee/FileController.coffee

+ 6 - 5
services/filestore/app/coffee/FileController.coffee

@@ -13,19 +13,20 @@ module.exports = FileController =
 	getFile: (req, res)->
 	getFile: (req, res)->
 		{key, bucket} = req
 		{key, bucket} = req
 		{format, style} = req.query
 		{format, style} = req.query
-		opts = {
+		options = {
 			key: key,
 			key: key,
 			bucket: bucket,
 			bucket: bucket,
 			format: format,
 			format: format,
 			style: style,
 			style: style,
 		}
 		}
 		metrics.inc "getFile"
 		metrics.inc "getFile"
+		logger.log key:key, bucket:bucket, format:format, style: style, "reciving request to get file"
 		if req.headers.range?
 		if req.headers.range?
 			range = FileController._get_range(req.headers.range)
 			range = FileController._get_range(req.headers.range)
-			opts.start = range.start
-			opts.end = range.end
-		logger.log key:key, bucket:bucket, format:format, style:style, "reciving request to get file"
-		FileHandler.getFile bucket, key, opts, (err, fileStream)->
+			options.start = range.start
+			options.end = range.end
+			logger.log start: range.start, end: range.end, "getting range of bytes from file"
+		FileHandler.getFile bucket, key, options, (err, fileStream)->
 			if err?
 			if err?
 				logger.err err:err, key:key, bucket:bucket, format:format, style:style, "problem getting file"
 				logger.err err:err, key:key, bucket:bucket, format:format, style:style, "problem getting file"
 				if !res.finished and res?.send?
 				if !res.finished and res?.send?