| OLD | NEW |
| 1 // Copyright (c) 2014, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2014, the Dart project authors. Please see the AUTHORS file |
| 2 // for details. All rights reserved. Use of this source code is governed by a | 2 // for details. All rights reserved. Use of this source code is governed by a |
| 3 // BSD-style license that can be found in the LICENSE file. | 3 // BSD-style license that can be found in the LICENSE file. |
| 4 | 4 |
| 5 library shelf.handlers.logger; | 5 library shelf.handlers.logger; |
| 6 | 6 |
| 7 import 'package:stack_trace/stack_trace.dart'; | 7 import 'package:stack_trace/stack_trace.dart'; |
| 8 | 8 |
| 9 import '../middleware.dart'; | 9 import '../middleware.dart'; |
| 10 import '../util.dart'; | 10 import '../util.dart'; |
| (...skipping 12 matching lines...) Expand all Loading... |
| 23 /// description and stack trace. | 23 /// description and stack trace. |
| 24 Middleware logRequests({void logger(String msg, bool isError)}) => | 24 Middleware logRequests({void logger(String msg, bool isError)}) => |
| 25 (innerHandler) { | 25 (innerHandler) { |
| 26 if (logger == null) logger = _defaultLogger; | 26 if (logger == null) logger = _defaultLogger; |
| 27 | 27 |
| 28 return (request) { | 28 return (request) { |
| 29 var startTime = new DateTime.now(); | 29 var startTime = new DateTime.now(); |
| 30 var watch = new Stopwatch()..start(); | 30 var watch = new Stopwatch()..start(); |
| 31 | 31 |
| 32 return syncFuture(() => innerHandler(request)).then((response) { | 32 return syncFuture(() => innerHandler(request)).then((response) { |
| 33 var msg = _getMessage(startTime, response.statusCode, request.pathInfo, | 33 var msg = _getMessage(startTime, response.statusCode, request.url, |
| 34 request.method, watch.elapsed); | 34 request.method, watch.elapsed); |
| 35 | 35 |
| 36 logger(msg, false); | 36 logger(msg, false); |
| 37 | 37 |
| 38 return response; | 38 return response; |
| 39 }, onError: (error, stackTrace) { | 39 }, onError: (error, stackTrace) { |
| 40 var msg = _getErrorMessage(startTime, request.pathInfo, request.method, | 40 var msg = _getErrorMessage(startTime, request.url, request.method, |
| 41 watch.elapsed, error, stackTrace); | 41 watch.elapsed, error, stackTrace); |
| 42 | 42 |
| 43 logger(msg, true); | 43 logger(msg, true); |
| 44 | 44 |
| 45 throw error; | 45 throw error; |
| 46 }); | 46 }); |
| 47 }; | 47 }; |
| 48 }; | 48 }; |
| 49 | 49 |
| 50 String _getMessage(DateTime requestTime, int statusCode, String pathInfo, | 50 String _getMessage(DateTime requestTime, int statusCode, Uri url, |
| 51 String method, Duration elapsedTime) { | 51 String method, Duration elapsedTime) { |
| 52 | 52 |
| 53 return '${requestTime}\t$elapsedTime\t$method\t[${statusCode}]\t${pathInfo}'; | 53 return '${requestTime}\t$elapsedTime\t$method\t[${statusCode}]\t${url}'; |
| 54 } | 54 } |
| 55 | 55 |
| 56 String _getErrorMessage(DateTime requestTime, String pathInfo, | 56 String _getErrorMessage(DateTime requestTime, Uri url, |
| 57 String method, Duration elapsedTime, Object error, StackTrace stack) { | 57 String method, Duration elapsedTime, Object error, StackTrace stack) { |
| 58 | 58 |
| 59 var chain = new Chain.current(); | 59 var chain = new Chain.current(); |
| 60 if (stack != null) { | 60 if (stack != null) { |
| 61 chain = new Chain.forTrace(stack) | 61 chain = new Chain.forTrace(stack) |
| 62 .foldFrames((frame) => frame.isCore || frame.package == 'shelf') | 62 .foldFrames((frame) => frame.isCore || frame.package == 'shelf') |
| 63 .terse; | 63 .terse; |
| 64 } | 64 } |
| 65 | 65 |
| 66 var msg = '${requestTime}\t$elapsedTime\t$method\t${pathInfo}\n$error'; | 66 var msg = '${requestTime}\t$elapsedTime\t$method\t${url}\n$error'; |
| 67 if(chain == null) return msg; | 67 if(chain == null) return msg; |
| 68 | 68 |
| 69 return '$msg\n$chain'; | 69 return '$msg\n$chain'; |
| 70 } | 70 } |
| 71 | 71 |
| 72 void _defaultLogger(String msg, bool isError) { | 72 void _defaultLogger(String msg, bool isError) { |
| 73 if (isError) { | 73 if (isError) { |
| 74 print('[ERROR] $msg'); | 74 print('[ERROR] $msg'); |
| 75 } else { | 75 } else { |
| 76 print(msg); | 76 print(msg); |
| 77 } | 77 } |
| 78 } | 78 } |
| OLD | NEW |