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

simplified createNoLogCondition

Browse Source
This commit is contained in:
Gareth Jones 2013-06-05 08:37:27 +10:00
parent 6368de1094
commit 7ca517b5ed
1 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
lib/connect-logger.js
View File

@ -145,9 +145,7 @@ function format(str, req, res) {
* @param {String} nolog * @param {String} nolog
* @return {RegExp} * @return {RegExp}
* @api private * @api private
*/ *
/**
* syntax * syntax
* 1. String * 1. String
* 1.1 "\\.gif" * 1.1 "\\.gif"
@ -169,27 +167,28 @@ function format(str, req, res) {
* SAME AS "\\.jpg|\\.png|\\.gif" * SAME AS "\\.jpg|\\.png|\\.gif"
*/ */
function createNoLogCondition(nolog, type) { function createNoLogCondition(nolog, type) {
if (!nolog) return null; var regexp = null;
type = type || '';
if (nolog) {
if (nolog instanceof RegExp) { if (nolog instanceof RegExp) {
if (type === 'string') { regexp = nolog;
return nolog.source;
} }
return nolog;
} else if (typeof nolog === 'string') { if (typeof nolog === 'string') {
if (type === 'string') { regexp = new RegExp(nolog);
return nolog;
} }
try {
return new RegExp(nolog); if (Array.isArray(nolog)) {
} catch (ex) { var regexpsAsStrings = nolog.map(
return null; function convertToStrings(o) {
return o.source ? o.source : o;
} }
} else if (nolog instanceof Array) { );
var regexps = nolog.map(function(o){ return createNoLogCondition(o, 'string'); }); regexp = new RegExp(regexpsAsStrings.join('|'));
return new RegExp(regexps.join('|'));
} }
} }
return regexp;
}
exports.connectLogger = getLogger; exports.connectLogger = getLogger;