Move log() function to be in app.js

Author: itay

app.js

@@ -7,6 +7,7 @@ var express = require('express');
 var config = require('./config.json');
 var servers = require('./server');
 var request = require('request');
+var _ = require('underscore');
 
 var app = module.exports = express.createServer();
 
@@ -46,13 +47,38 @@ var createSender = function(port) {
   };
 }
 
+// Pad a number with preceding zeroes
+var pad = function(number, length) {
+    var str = '' + number;
+    while (str.length < length) {
+        str = '0' + str;
+    }
+   
+    return str;
+}
+
+var logs = [];
 var peers = [];
-for(var i = 0; i < numServers; i++) {
-  var port = startPort + i + 1;
+_.each(_.range(numServers), function(idx) {
+  var port = startPort + idx + 1;
   senders[port] = createSender(port);
-  servers.create(port);
+  
+  // Create a log function that will generate sortable
+  // log data
+  var prefix = "[server:" + port + "]";
+  var index = 0;
+  var log = function() {
+      var date = "[" + (new Date()).toISOString() + ":" + pad((++index), 6) + "]";
+      var args = _.toArray(arguments);
+      args.unshift(prefix + date + "[" + port + "]");
+      console.log.apply(console, args);
+  }
+  
   peers.push(port);
-}
+  logs.push(log);
+  
+  servers.create(port, log);
+});
 
 var start = null;
 

package.json

@@ -8,6 +8,7 @@
       "request": "2.5.8",
       "underscore": "1.3.3",
       "request": "2.9.202",
-      "async": "0.1.18"
+      "async": "0.1.18",
+      "socket.io": "0.9.6"
   }
 }

server.js

@@ -1,4 +1,4 @@
-module.exports.create = function(port) {
+module.exports.create = function(port, log) {
     var express = require('express');
     var _       = require('underscore');
     var async   = require('async');
@@ -31,27 +31,6 @@ module.exports.create = function(port) {
     });
 
     /****** UTILITY FUNCTIONS ******/
-    
-    // Pad a number with preceding zeroes
-    var pad = function(number, length) {
-        var str = '' + number;
-        while (str.length < length) {
-            str = '0' + str;
-        }
-       
-        return str;
-    }
-    
-    // Create a log function that will generate sortable
-    // log data
-    var prefix = "[server:" + port + "]";
-    var index = 0;
-    var log = function() {
-        var date = "[" + (new Date()).toISOString() + ":" + pad((++index), 6) + "]";
-        var args = _.toArray(arguments);
-        args.unshift(prefix + date + "[" + port + "]");
-        console.log.apply(console, args);
-    }
 
     // Whether or not we should drop a packet
     var shouldDrop = function() {