From f2abcbb429229d825d79de983658ad9c667de987 Mon Sep 17 00:00:00 2001 From: Zachary Boyd Date: Sun, 6 May 2018 22:54:21 -0700 Subject: [PATCH] Makes the log entires that describe network traffic "verbose" instead of "debug". Sets the default logLevel to "info". Fixes a bug with setting the logLevel via the command line --- bin/tor-router | 8 +++++--- src/DNSServer.js | 2 +- src/HTTPServer.js | 4 ++-- src/SOCKSServer.js | 2 +- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/bin/tor-router b/bin/tor-router index 2446042..2c723f9 100755 --- a/bin/tor-router +++ b/bin/tor-router @@ -17,14 +17,16 @@ program .option('-s, --socksPort [9050]', 'SOCKS Server port', Number) .option('-d, --dnsPort [9053]', 'DNS Server port', Number) .option('-h, --httpPort [9080]', 'HTTP Server port', Number) - .option('-l, --logLevel [info]', 'Log level (defaults to "info") set to "null" to disable logging', Number) + .option('-l, --logLevel [info]', 'Log level (defaults to "info") set to "null" to disable logging. To see a log of all network traffic set logLevel to "verbose"') .parse(process.argv); +let logLevel = (program.logLevel || 'info'); + var logger = winston.createLogger({ - level: (program.logLevel || 'info'), + level: logLevel, format: winston.format.simple(), transports: [ - new (winston.transports.Console)({ level: (program.logLevel || 'info') }) + new (winston.transports.Console)({ level: logLevel }) ] }); diff --git a/src/DNSServer.js b/src/DNSServer.js index baa14e4..800f4f8 100644 --- a/src/DNSServer.js +++ b/src/DNSServer.js @@ -21,7 +21,7 @@ class DNSServer extends UDPServer { if (!err && answer) { for (let a of answer.answer){ res.answer.push(a); - this.logger && this.logger.info(`[dns]: ${question.name} type ${dns.consts.QTYPE_TO_NAME[question.type]} → 127.0.0.1:${dns_port} → ${a.address}`) + this.logger && this.logger.verbose(`[dns]: ${question.name} type ${dns.consts.QTYPE_TO_NAME[question.type]} → 127.0.0.1:${dns_port} → ${a.address}`) } } }); diff --git a/src/HTTPServer.js b/src/HTTPServer.js index 0064cd2..cad45bb 100644 --- a/src/HTTPServer.js +++ b/src/HTTPServer.js @@ -35,7 +35,7 @@ class HTTPServer extends Server { let connect = (tor_instance) => { let socks_port = tor_instance.socks_port; - logger && logger.info(`[http-proxy]: ${req.connection.remoteAddress}:${req.connection.remotePort} → 127.0.0.1:${socks_port} → ${url.hostname}:${url.port}`); + logger && logger.verbose(`[http-proxy]: ${req.connection.remoteAddress}:${req.connection.remotePort} → 127.0.0.1:${socks_port} → ${url.hostname}:${url.port}`); d.run(() => { let proxy_req = http.request({ @@ -96,7 +96,7 @@ class HTTPServer extends Server { let connect = (tor_instance) => { let socks_port = tor_instance.socks_port; - logger && logger.info(`[http-connect]: ${req.connection.remoteAddress}:${req.connection.remotePort} → 127.0.0.1:${socks_port} → ${hostname}:${port}`) + logger && logger.verbose(`[http-connect]: ${req.connection.remoteAddress}:${req.connection.remotePort} → 127.0.0.1:${socks_port} → ${hostname}:${port}`) var outbound_socket; let onClose = (error) => { diff --git a/src/SOCKSServer.js b/src/SOCKSServer.js index 50e734f..1a38ff8 100644 --- a/src/SOCKSServer.js +++ b/src/SOCKSServer.js @@ -34,7 +34,7 @@ class SOCKSServer extends SOCKS5Server{ let connect = (tor_instance) => { let socks_port = tor_instance.socks_port; - logger && logger.info(`[socks]: ${info.srcAddr}:${info.srcPort} → 127.0.0.1:${socks_port} → ${info.dstAddr}:${info.dstPort}`) + logger && logger.verbose(`[socks]: ${info.srcAddr}:${info.srcPort} → 127.0.0.1:${socks_port} → ${info.dstAddr}:${info.dstPort}`) d.on('error', onClose);