cartodb4/log4js-node
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Trailing whitespace Sublime removed

Browse Source
This commit is contained in:
Christo Fogelberg
2015-03-08 19:35:54 +00:00
parent 35067af550
commit ba80dc1588
1 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
lib/connect-logger.js
View File

@@ -1,8 +1,8 @@
"use strict"; "use strict";
var levels = require("./levels"); var levels = require("./levels");
var DEFAULT_FORMAT = ':remote-addr - -' + var DEFAULT_FORMAT = ':remote-addr - -' +
' ":method :url HTTP/:http-version"' + ' ":method :url HTTP/:http-version"' +
' :status :content-length ":referrer"' + ' :status :content-length ":referrer"' +
' ":user-agent"'; ' ":user-agent"';
/** /**
* Log requests with the given `options` or a `format` string. * Log requests with the given `options` or a `format` string.
@@ -52,7 +52,7 @@ function getLogger(logger4js, options) {
// nologs // nologs
if (nolog && nolog.test(req.originalUrl)) return next(); if (nolog && nolog.test(req.originalUrl)) return next();
if (thislogger.isLevelEnabled(level) || options.level === 'auto') { if (thislogger.isLevelEnabled(level) || options.level === 'auto') {
var start = new Date() var start = new Date()
, statusCode , statusCode
, writeHead = res.writeHead , writeHead = res.writeHead
@@ -60,7 +60,7 @@ function getLogger(logger4js, options) {
// flag as logging // flag as logging
req._logging = true; req._logging = true;
// proxy for statusCode. // proxy for statusCode.
res.writeHead = function(code, headers){ res.writeHead = function(code, headers){
res.writeHead = writeHead; res.writeHead = writeHead;
@@ -77,7 +77,7 @@ function getLogger(logger4js, options) {
level = levels.toLevel(options.level, levels.INFO); level = levels.toLevel(options.level, levels.INFO);
} }
}; };
//hook on end request to emit the log entry of the HTTP request. //hook on end request to emit the log entry of the HTTP request.
res.on('finish', function() { res.on('finish', function() {
res.responseTime = new Date() - start; res.responseTime = new Date() - start;
@@ -97,7 +97,7 @@ function getLogger(logger4js, options) {
} }
}); });
} }
//ensure next gets always called //ensure next gets always called
next(); next();
}; };
@@ -123,20 +123,20 @@ function format(str, req, res) {
.replace(':referrer', req.headers.referer || req.headers.referrer || '') .replace(':referrer', req.headers.referer || req.headers.referrer || '')
.replace(':http-version', req.httpVersionMajor + '.' + req.httpVersionMinor) .replace(':http-version', req.httpVersionMajor + '.' + req.httpVersionMinor)
.replace( .replace(
':remote-addr', req.ip || req._remoteAddress || ( ':remote-addr', req.ip || req._remoteAddress || (
req.socket && req.socket &&
(req.socket.remoteAddress || (req.socket.socket && req.socket.socket.remoteAddress)) (req.socket.remoteAddress || (req.socket.socket && req.socket.socket.remoteAddress))
)) ))
.replace(':user-agent', req.headers['user-agent'] || '') .replace(':user-agent', req.headers['user-agent'] || '')
.replace( .replace(
':content-length', ':content-length',
(res._headers && res._headers['content-length']) || (res._headers && res._headers['content-length']) ||
(res.__headers && res.__headers['Content-Length']) || (res.__headers && res.__headers['Content-Length']) ||
'-' '-'
) )
.replace(/:req\[([^\]]+)\]/g, function(_, field){ return req.headers[field.toLowerCase()]; }) .replace(/:req\[([^\]]+)\]/g, function(_, field){ return req.headers[field.toLowerCase()]; })
.replace(/:res\[([^\]]+)\]/g, function(_, field){ .replace(/:res\[([^\]]+)\]/g, function(_, field){
return res._headers ? return res._headers ?
(res._headers[field.toLowerCase()] || res.__headers[field]) (res._headers[field.toLowerCase()] || res.__headers[field])
: (res.__headers && res.__headers[field]); : (res.__headers && res.__headers[field]);
}); });
@@ -155,9 +155,9 @@ function format(str, req, res) {
* NOT LOGGING http://example.com/hoge.gif and http://example.com/hoge.gif?fuga * NOT LOGGING http://example.com/hoge.gif and http://example.com/hoge.gif?fuga
* LOGGING http://example.com/hoge.agif * LOGGING http://example.com/hoge.agif
* 1.2 in "\\.gif|\\.jpg$" * 1.2 in "\\.gif|\\.jpg$"
* NOT LOGGING http://example.com/hoge.gif and * NOT LOGGING http://example.com/hoge.gif and
* http://example.com/hoge.gif?fuga and http://example.com/hoge.jpg?fuga * http://example.com/hoge.gif?fuga and http://example.com/hoge.jpg?fuga
* LOGGING http://example.com/hoge.agif, * LOGGING http://example.com/hoge.agif,
* http://example.com/hoge.ajpg and http://example.com/hoge.jpg?hoge * http://example.com/hoge.ajpg and http://example.com/hoge.jpg?hoge
* 1.3 in "\\.(gif|jpe?g|png)$" * 1.3 in "\\.(gif|jpe?g|png)$"
* NOT LOGGING http://example.com/hoge.gif and http://example.com/hoge.jpeg * NOT LOGGING http://example.com/hoge.gif and http://example.com/hoge.jpeg
@@ -175,15 +175,15 @@ function createNoLogCondition(nolog) {
if (nolog) { if (nolog) {
if (nolog instanceof RegExp) { if (nolog instanceof RegExp) {
regexp = nolog; regexp = nolog;
} }
if (typeof nolog === 'string') { if (typeof nolog === 'string') {
regexp = new RegExp(nolog); regexp = new RegExp(nolog);
} }
if (Array.isArray(nolog)) { if (Array.isArray(nolog)) {
var regexpsAsStrings = nolog.map( var regexpsAsStrings = nolog.map(
function convertToStrings(o) { function convertToStrings(o) {
return o.source ? o.source : o; return o.source ? o.source : o;
} }
); );