Merge branch 'feature/connection-stats'

LearnBoost · Mar 23, 2011 · 9fec2b7 · 9fec2b7
2 parents 1b696cb + 4d34365
commit 9fec2b7
Show file tree

Hide file tree

Showing 3 changed files with 98 additions and 43 deletions.
diff --git a/examples/repl.js b/examples/repl.js
@@ -20,12 +20,11 @@ cluster.repl.define('echo', function(master, sock, msg){
 }, 'echo the given message');
 
 // $ telnet localhots 8888
-
 cluster(server)
   .set('workers', 4)
   .set('socket path', '/tmp')
   .use(cluster.logger('logs'))
-  .use(cluster.stats())
+  .use(cluster.stats({ connections: true }))
   .use(cluster.repl(8888, '127.0.0.1'))
   .use(cluster.debug())
   .listen(3000);
diff --git a/lib/master.js b/lib/master.js
@@ -333,7 +333,11 @@ Master.prototype.has = function(option){
 Master.prototype.use = function(plugin){
   if (this.environmentMatches) {
     this.plugins.push(plugin);
-    if (!this.isWorker) plugin(this);
+    if (this.isWorker) {
+      plugin.enableInWorker && plugin(this);
+    } else {
+      plugin(this);
+    }
   }
   return this;
 };

diff --git a/lib/plugins/stats.js b/lib/plugins/stats.js
@@ -23,50 +23,90 @@ try {
 }
 
 /**
- * Enable stat tracking.
+ * Enable stat tracking with the given `options`.
  *
+ * Options:
+ *
+ *  - `connections`  enable connection statistics
+ *
+ * @param {Object} options
  * @return {Function}
  * @api public
  */
 
-module.exports = function(){
-  return function(master){
-    master.stats = {
-        start: new Date
-      , restarts: 0
-      , workersSpawned: 0
-      , workersKilled: 0
-    };
-
-    // 0.4.x
-    if (os) {
-      master.stats.totalmem = os.totalmem();
-      master.stats.freemem = os.freemem();
+module.exports = function(options){
+  options = options || {};
+  stats.enableInWorker = options.connections;
+
+  function stats(master){
+    var server = master.server;
+
+    // worker stats
+    if (master.isWorker) {
+      server.on('connection', function(sock){
+        master.call('reportStats', 'connection');
+        sock.on('close', function(){
+          master.call('reportStats', 'disconnection');
+        });
+      });
+    // master stats
+    } else {
+      master.stats = {
+          start: new Date
+        , restarts: 0
+        , workersSpawned: 0
+        , workersKilled: 0
+      };
+
+      // 0.4.x
+      if (os) {
+        master.stats.totalmem = os.totalmem();
+        master.stats.freemem = os.freemem();
+      }
+
+      // worker stats
+      master.reportStats = function(worker, type){
+        switch (type) {
+          case 'connection':
+            worker.stats.connectionsTotal++;
+            worker.stats.connectionsActive++;
+            break;
+          case 'disconnection':
+            worker.stats.connectionsActive--;
+            break;
+        }
+      };
+
+      // total workers spawned
+      master.on('worker', function(worker){
+        ++master.stats.workersSpawned;
+        worker.stats = {
+            start: new Date
+          , connectionsTotal: 0
+          , connectionsActive: 0
+        };
+      });
+
+      // total worker deaths
+      master.on('worker killed', function(worker){
+        ++master.stats.workersKilled;
+      });
+
+      // restarting
+      master.on('restarting', function(data){
+        ++master.stats.restarts;
+        data.stats = master.stats;
+      });
+
+      // restart
+      master.on('restart', function(data){
+        master.stats = data.stats;
+        master.stats.start = new Date(master.stats.start);
+      });
     }
-
-    // total workers spawned
-    master.on('worker', function(worker){
-      ++master.stats.workersSpawned;
-      worker.stats = { start: new Date };
-    });
-
-    // total worker deaths
-    master.on('worker killed', function(worker){
-      ++master.stats.workersKilled;
-    });
-
-    // restarting
-    master.on('restarting', function(data){
-      ++master.stats.restarts;
-      data.stats = master.stats;
-    });
-
-    // restart
-    master.on('restart', function(data){
-      master.stats = data.stats;
-      master.stats.start = new Date(master.stats.start);
-    });
   }
+
+  return stats;
 };
 
 /**
@@ -105,9 +145,21 @@ repl.define('stats', function(master, sock){
   // worker stats
   sock.title('Workers');
   master.children.forEach(function(worker){
-    sock.row(
-      'uptime #' + worker.id
-      , utils.formatDateRange(new Date, worker.stats.start));
+    var stats = '';
+
+    // uptime
+    stats += utils.formatDateRange(new Date, worker.stats.start);
+
+    // connections
+    if (worker.stats.connectionsTotal) {
+      stats += ' ('
+        + worker.stats.connectionsActive
+        + '/'
+        + worker.stats.connectionsTotal
+        + ')';
+    }
+
+    sock.row(worker.id, stats);
   });
   sock.write('\n');
 }, 'Display server statistics');