PR fixes

Author: steveslayden

README.md

@@ -92,10 +92,11 @@ Usage: nodejs-dashboard [options] -- [node] [script] [arguments]
 ```
 Options:
 
-  -h, --help             output usage information
-  -V, --version          output the version number
-  -p, --port [port]      Socket listener port
-  -e, --eventdelay [ms]  Minimum threshold for event loop reporting, default 10ms
+  -h, --help               output usage information
+  -V, --version            output the version number
+  -p, --port [port]        Socket listener port
+  -e, --eventdelay [ms]    Minimum threshold for event loop reporting, default 10ms
+  -s, --scrollback [count] Maximum scroll history for log windows
 ```
 
 #####`--port`
@@ -104,4 +105,7 @@ Under the hood the dashboard utilizes SocketIO with a default port of `9838`. If
 #####`--eventdelay`
 This tunes the minimum threshold for reporting event loop delays. The default value is `10ms`. Any delay below this value will be reported at `0`.
 
+#####`--scrollback`
+Specifies the maximum number of lines that log windows (e.g. stdout, stderr) will buffer in order to scroll backwards and see the history. The default is 1000 lines.
+
 To gracefully exit and terminate the spawned process use one of:  `Ctrl + C`, `Q`, or `ESC`.

bin/nodejs-dashboard.js

@@ -17,6 +17,7 @@ var program = new commander.Command(pkg.name);
 program.version(pkg.version);
 program.option("-p, --port [port]", "Socket listener port");
 program.option("-e, --eventdelay [ms]", "Minimum threshold for event loop reporting, default 10ms");
+program.option("-s, --scrollback [count]", "Maximum scroll history for log windows");
 program.usage("[options] -- [node] [script] [arguments]");
 program.parse(process.argv);
 

lib/dashboard-agent.js

@@ -1,12 +1,11 @@
 "use strict";
 
-var SocketIO = require("socket.io-client");
+var socketWriterFactory = require("./socket-writer");
 var blocked = require("blocked");
 var pusage = require("pidusage");
 var os = require("os");
 var _ = require("lodash");
 var config = require("./config");
-var socketWriterFactory = require("./socket-writer");
 
 var dashboardAgent = function () {
 
@@ -21,7 +20,7 @@ var dashboardAgent = function () {
   var metrics = {
     eventLoop: {
       delay: 0,
-      high: 0,
+      high: 0
     },
     mem: {
       systemTotal: os.totalmem()
@@ -77,7 +76,7 @@ var dashboardAgent = function () {
   };
 
   var destroy = function () {
-    socket.close();
+    socketWriter.close();
     clearInterval(options.intervalId);
   };
 

lib/socket-writer.js

@@ -8,27 +8,38 @@ var SocketIO = require("socket.io-client");
 // Potentially related to: https://github.com/socketio/socket.io-client/issues/845
 module.exports = function create(options) {
 
-  var connected;
+  var connected = false;
 
   var socket = new SocketIO("http://localhost:" + options.port);
 
-  socket.on('connect', function() {
+  socket.on("connect", function socketOnConnect() {
     connected = true;
   });
 
-  socket.on('reconnect', function() {
+  socket.on("reconnect", function socketOnReconnect() {
     connected = true;
   });
 
-  socket.on('disconnect', function() {
+  socket.on("disconnect", function socketOnDisconnect() {
     connected = false;
   });
 
-  return {
-    write: function(name, data) {
-      if(connected) {
-        return socket.emit(name, data);
-      }
+  var write = function write(name, data) {
+    if (connected && socket) {
+      socket.emit(name, data);
+    }
+  };
+
+  var close = function close() {
+    if (socket) {
+      socket.close();
+      socket = null;
+      connected = false;
     }
   };
+
+  return {
+    write: write,
+    close: close
+  };
 };

lib/views/stream-view.js

@@ -45,6 +45,9 @@ StreamView.prototype.onEvent = function (data) {
 // the original method calls shiftLine with two parameters (start, end)
 // when it should call it with just one (num lines to shift out)
 // blessed v0.1.81 - https://github.com/chjj/blessed/issues/255
+// disable eslint for the next section since it is a copy/fix from the original
+// blessed log.js codebase
+/* eslint-disable */
 blessed.log.prototype.log =
 blessed.log.prototype.add = function() {
   var args = Array.prototype.slice.call(arguments);
@@ -55,9 +58,10 @@ blessed.log.prototype.add = function() {
   this.emit('log', text);
   var ret = this.pushLine(text);
   if (this._clines.fake.length > this.scrollback) {
-    this.shiftLine((this.scrollback / 3) | 0);
+    this.shiftLine((this.scrollback / 3) | 0); // fixed line
   }
   return ret;
 };
+/* eslint-enable */
 
 module.exports = StreamView;