Skip to content

Commit

Permalink
replace console.log with logger.log
Browse files Browse the repository at this point in the history
  • Loading branch information
chimurai committed Sep 9, 2015
1 parent 13f9491 commit 571e85e
Show file tree
Hide file tree
Showing 5 changed files with 80 additions and 15 deletions.
12 changes: 7 additions & 5 deletions index.js
Expand Up @@ -5,6 +5,7 @@ var handlers = require('./lib/handlers');
var contextMatcher = require('./lib/context-matcher');
var PathRewriter = require('./lib/path-rewriter');
var ProxyTable = require('./lib/proxy-table');
var logger = require('./lib/logger');

var httpProxyMiddleware = function (context, opts) {
var isWsUpgradeListened = false;
Expand All @@ -13,7 +14,7 @@ var httpProxyMiddleware = function (context, opts) {

// create proxy
var proxy = httpProxy.createProxyServer(proxyOptions);
console.log('[HPM] Proxy created:', config.context, ' -> ', proxyOptions.target);
logger.info('[HPM] Proxy created:', config.context, ' -> ', proxyOptions.target);

var pathRewriter = PathRewriter.create(proxyOptions.pathRewrite); // returns undefined when "pathRewrite" is not provided

Expand All @@ -31,7 +32,7 @@ var httpProxyMiddleware = function (context, opts) {
// Listen for the `close` event on `proxy`.
proxy.on('close', function (req, socket, head) {
// view disconnected websocket connections
console.log('[HPM] Client disconnected');
logger.info('[HPM] Client disconnected');
});

// https://github.com/chimurai/http-proxy-middleware/issues/19
Expand All @@ -50,11 +51,12 @@ var httpProxyMiddleware = function (context, opts) {
}

if (contextMatcher.match(config.context, req.url)) {
logger.debug('[HPM] Matched request: %s with context: ', req.url, config.context);

// handle option.pathRewrite
if (pathRewriter) {
req.url = pathRewriter(req.url);
}

if (proxyOptions.proxyTable) {
// change option.target when proxyTable present.
proxy.web(req, res, ProxyTable.createProxyOptions(req, proxyOptions));
Expand Down Expand Up @@ -87,7 +89,7 @@ var httpProxyMiddleware = function (context, opts) {
req.url = pathRewriter(req.url);
}
proxy.ws(req, socket, head);
console.log('[HPM] Upgrading to WebSocket');
logger.info('[HPM] Upgrading to WebSocket');
}
}

Expand All @@ -101,7 +103,7 @@ var httpProxyMiddleware = function (context, opts) {

function proxyErrorLogger (err, req, res) {
var targetUri = proxyOptions.target.host + req.url;
console.log('[HPM] Proxy error:', err.code, targetUri);
logger.error('[HPM] Proxy error:', err.code, targetUri);
}

};
Expand Down
15 changes: 8 additions & 7 deletions lib/config-factory.js
@@ -1,5 +1,6 @@
var _ = require('lodash');
var url = require('url');
var _ = require('lodash');
var url = require('url');
var logger = require('./logger');

module.exports = {
createConfig : createConfig
Expand Down Expand Up @@ -49,11 +50,11 @@ function isShortHand (context) {
function mapLegacyProxyHostOption (options) {
// set options.headers.host when option.proxyHost is provided
if (options.proxyHost) {
console.log('*************************************');
console.log('[HPM] Deprecated "option.proxyHost"');
console.log(' Use "option.changeOrigin" or "option.headers.host" instead');
console.log(' "option.proxyHost" will be removed in future release.');
console.log('*************************************');
logger.info('*************************************');
logger.info('[HPM] Deprecated "option.proxyHost"');
logger.info(' Use "option.changeOrigin" or "option.headers.host" instead');
logger.info(' "option.proxyHost" will be removed in future release.');
logger.info('*************************************');

options.headers = options.headers || {};
options.headers.host = options.proxyHost;
Expand Down
61 changes: 61 additions & 0 deletions lib/logger.js
@@ -0,0 +1,61 @@
module.exports = new Logger();

var LEVEL = {
debug : 10,
info : 20,
warn : 50,
error : 100
}

function Logger () {
var logLevel = 'info';

return {
log : log,
debug : debug,
info : info,
warn : warn,
error : error,
level : logLevel
}

function log () {
console.log.apply(null, arguments);
}

function debug () {
if (isLevel('debug')) {
console.log.apply(null, arguments);
}
}

function info () {
if (isLevel('info')) {
console.log.apply(null, arguments);
}
}

function warn () {
if (isLevel('warn')) {
console.log.apply(null, arguments);
}
}

function error () {
if (isLevel('error')) {
console.log.apply(null, arguments);
}
}

function isLevel (level) {
var result = false;
var currentLogLevel = LEVEL[logLevel];

if (currentLogLevel && (currentLogLevel <= LEVEL[level])) {
result = true;
}

return result;
}
}

6 changes: 4 additions & 2 deletions lib/path-rewriter.js
@@ -1,4 +1,5 @@
var _ = require('lodash');
var _ = require('lodash');
var logger = require('./logger');

module.exports = {
create : createPathRewriter
Expand All @@ -23,6 +24,7 @@ function createPathRewriter (config) {
_.forEach(rules,function (rule) {
if (rule.regex.test(path)) {
result = result.replace(rule.regex, rule.value);
logger.debug('[HPM] Rewriting path from "%s" to "%s"', path, result);
return false;
}
});
Expand All @@ -43,7 +45,7 @@ function parsePathRewriteRules (config) {
regex : new RegExp(key),
value : config[key]
});
console.log('[HPM] Proxy rewrite rule created: "' + key + '" -> "' + config[key] + '"');
logger.info('[HPM] Proxy rewrite rule created: "%s" -> "%s"', key, config[key]);
});

}
Expand Down
1 change: 0 additions & 1 deletion test/http-proxy-middleware.spec.js
Expand Up @@ -534,7 +534,6 @@ function createServer (portNumber, middleware, path) {
var app = express();

if (middleware, path) {
console.log('pathpathpathpathpathpathpath: ', path);
app.use(path, middleware);
}
else if (middleware) {
Expand Down

0 comments on commit 571e85e

Please sign in to comment.