Merge "return rss & heapTotal for pomelo list"

fubuki · Jan 28, 2014 · d21d044 · d21d044
2 parents 34de3be + 285a626
commit d21d044
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/bin/pomelo b/bin/pomelo
@@ -279,11 +279,11 @@ function list(opts) {
       };
       servers.sort(comparer);
       var rows = [];
-      rows.push(['serverId', 'serverType', 'pid', 'heapUsed(M)', 'uptime(m)']);
+      rows.push(['serverId', 'serverType', 'pid', 'rss(M)', 'heapTotal(M)', 'heapUsed(M)', 'uptime(m)']);
       servers.forEach(function(server) {
-        rows.push([server.serverId, server.serverType, server.pid, server.heapUsed, server.uptime]);
+        rows.push([server.serverId, server.serverType, server.pid, server.rss, server.heapTotal, server.heapUsed, server.uptime]);
       });
-      console.log(cliff.stringifyRows(rows, ['red', 'blue', 'green', 'white', 'yellow']));
+      console.log(cliff.stringifyRows(rows, ['red', 'blue', 'green', 'cyan', 'magenta', 'white', 'yellow']));
       process.exit(0);
     });
   });

diff --git a/lib/modules/console.js b/lib/modules/console.js
@@ -42,11 +42,13 @@ Module.prototype.monitorHandler = function(agent, msg, cb) {
       var serverId = agent.id;
       var serverType = agent.type;
       var pid = process.pid;
-      var heapUsed = (process.memoryUsage().heapUsed/(1000 * 1000)).toFixed(2);
+      var heapUsed = (process.memoryUsage().heapUsed/(1024 * 1024)).toFixed(2);
+      var rss = (process.memoryUsage().rss/(1024 * 1024)).toFixed(2);
+      var heapTotal = (process.memoryUsage().heapTotal/(1024 * 1024)).toFixed(2);
       var uptime = (process.uptime()/60).toFixed(2);
-      cb({
+      utils.invokeCallback(cb, {
         serverId: serverId,
-        body: {serverId:serverId, serverType: serverType, pid:pid, heapUsed:heapUsed, uptime:uptime}
+        body: {serverId:serverId, serverType: serverType, pid:pid, rss: rss, heapTotal: heapTotal, heapUsed:heapUsed, uptime:uptime}
       });
       break;
     case 'kill':