fixing bugs in tcpserver and connection

pbeardshear · Jul 27, 2013 · 76cb59e · 76cb59e
1 parent ac9546e
commit 76cb59e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 8 deletions.
diff --git a/lib/connections/TCPConnection.js b/lib/connections/TCPConnection.js
@@ -53,12 +53,12 @@ TCPConnection.drop = function () {
 // Event listeners
 
 TCPConnection.onMessage = function (data) {
+	//console.log('RECEIVED DATA MESSAGE:', data);
+
 	if (!this.onBeforeMessage()) {
 		return;
 	}
 
-	console.log('RECEIVED DATA MESSAGE:', data);
-
 	var payload = Buffer.isBuffer(data) ? data.toString() : data,
 		type = 'message';
 	// Try to parse the payload

diff --git a/lib/server.js b/lib/server.js
@@ -38,7 +38,6 @@ Server.init = function (channel, manager, config) {
 Server.start = function (port) {
 	this.port = port;
 	this.acceptingConnections = true;
-	console.log('==== GOT START', port);
 	this.channel.emit('server:message', 'start');
 };
 
@@ -78,7 +77,6 @@ Server.resume = function () {
 Server.verifyRequest = function (request, connection) {
 	var self = this;
 	this.manager.emit('server:message', 'request', request, function (allow) {
-		console.log('RECEIVED RESPONSE', allow);
 		if (allow && self.acceptingConnections) {
 			self.accept(connection);
 		}

diff --git a/lib/servers/TCPServer.js b/lib/servers/TCPServer.js
@@ -29,7 +29,6 @@ TCPServer.init = function (channel, manager, config) {
 TCPServer.start = function (port, host) {
 	// A port value of 0 will assign a random open port
 	var defaultPort = 0;
-	console.log('==== STARTING SERVER');
 	this.server.listen(this.port || defaultPort, host);
 	this._super(this.port || defaultPort);
 };
@@ -41,7 +40,7 @@ TCPServer.start = function (port, host) {
  * @param {bool} shutdown - force close (end) all connections without waiting for a response
  */
 TCPServer.close = function (shutdown) {
-	this.server.close(this.onClose.bind(this));
+	this.server.close();
 
 	this._super(shutdown);
 };
@@ -53,7 +52,6 @@ TCPServer.close = function (shutdown) {
  * @param {Net.Socket} socket - instance of raw node TCP socket object
  */
 TCPServer.accept = function (socket) {
-	console.log('ACCEPTING CONNECTION');
 	var tcpConn = new TCPConnection(this.processID, socket, this.manager);
 	this._super(tcpConn);
 };
@@ -73,7 +71,6 @@ TCPServer.onConnection = function (socket) {
 		address: socket.remoteAddress,
 		port: socket.remotePort
 	};
-	console.log('GOT CONNECTION');
 	this.verifyRequest(request, socket);
 };