From a89b3976b25516db9b601c0327948f3d90fab006 Mon Sep 17 00:00:00 2001 From: indexzero Date: Fri, 15 Apr 2011 20:22:22 -0400 Subject: [PATCH] [api] Remove winston logging in favor of custom events --- CHANGELOG.md | 4 ++++ lib/node-http-proxy.js | 12 +++++++----- lib/proxy-table.js | 7 +------ package.json | 3 +-- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7df0e59..0bc2bae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ ## ChangeLog for: node-http-proxy +## Version 0.5.0 - 4/15/2011 +- Remove winston in favor of custom events (indexzero) + + ## Version 0.4.1 - 3/20/2011 - Include missing dependency in package.json (indexzero) diff --git a/lib/node-http-proxy.js b/lib/node-http-proxy.js index 001f181..d9f2d15 100644 --- a/lib/node-http-proxy.js +++ b/lib/node-http-proxy.js @@ -27,7 +27,6 @@ var util = require('util'), http = require('http'), events = require('events'), - winston = require('winston'), ProxyTable = require('./proxy-table').ProxyTable, maxSockets = 100; @@ -105,7 +104,7 @@ exports.createServer = function () { proxy = new HttpProxy(options); server = http.createServer(function (req, res) { - winston.verbose('Incoming HTTP request to: ' + req.headers.host + req.url); + proxy.emit('request', req, req.headers.host, req.url); // If we were passed a callback to process the request // or response in some way, then call it. @@ -113,11 +112,9 @@ exports.createServer = function () { callback(req, res, proxy); } else if (port && host) { - winston.verbose('Proxying HTTP request to: ' + host + ':' + port); proxy.proxyRequest(req, res, port, host); } else if (proxy.proxyTable) { - winston.verbose('Proxying request using proxy table'); proxy.proxyRequest(req, res); } else { @@ -279,12 +276,17 @@ HttpProxy.prototype.proxyRequest = function (req, res, port, host, buffer) { host = location.host; } + // + // Emit the `start` event indicating that we have begun the proxy operation. + // + this.emit('start', req, res, host, port); + // // If forwarding is enabled for this instance, foward proxy the // specified request to the address provided in `this.options.forward` // if (this.options.forward) { - winston.verbose('Forwarding HTTP request to: ' + this.options.forward.host + ':' + this.options.forward.port); + this.emit('forward', req, res, this.options.forward.host, this.options.forward.port); this._forwardRequest(req); } diff --git a/lib/proxy-table.js b/lib/proxy-table.js index 9236c62..90a129b 100644 --- a/lib/proxy-table.js +++ b/lib/proxy-table.js @@ -26,8 +26,7 @@ var util = require('util'), events = require('events'), - fs = require('fs'), - winston = require('winston'); + fs = require('fs'); // // ### function ProxyTable (router, silent) @@ -119,8 +118,6 @@ ProxyTable.prototype.getProxyLocation = function (req) { host = location[0], port = location.length === 1 ? 80 : location[1]; - winston.verbose('Proxy Table proxying request to: ' + host + ':' + port); - return { port: port, host: host @@ -136,8 +133,6 @@ ProxyTable.prototype.getProxyLocation = function (req) { host = location[0], port = location.length === 1 ? 80 : location[1]; - winston.verbose('Proxy Table proxying request to: ' + host + ':' + port); - return { port: port, host: host diff --git a/package.json b/package.json index 22e59c8..c08f1a1 100644 --- a/package.json +++ b/package.json @@ -17,8 +17,7 @@ "colors": ">= 0.3.0", "optimist": ">= 0.1.6", "request": ">= 1.9.0", - "vows": ">= 0.5.8", - "winston": ">= 0.2.5" + "vows": ">= 0.5.8" }, "main": "./lib/node-http-proxy", "bin": { "node-http-proxy": "./bin/node-http-proxy" },