From 632aa74bf8e1b07474d6ecd43ea0d702c1b20ce2 Mon Sep 17 00:00:00 2001
From: Marc Trudel <mtrudel@wizcorp.jp>
Date: Sun, 20 Jan 2013 16:05:30 +0900
Subject: [PATCH 1/3] * Now it is possible to specify a group to a service

---
 api.js                   |  1 +
 public/index.html        | 65 ++++++++++++++++++++++++++++------------
 public/styles/master.css |  8 +++++
 3 files changed, 55 insertions(+), 19 deletions(-)

diff --git a/api.js b/api.js
index b8353b9..30e06a9 100644
--- a/api.js
+++ b/api.js
@@ -93,6 +93,7 @@ module.exports.checkAllServices = function() {
   for (var i = 0; i < settings.services.length; i++) {
     status.services[i] = {};
     status.services[i].name = settings.services[i].name;
+    status.services[i].group = settings.services[i].group;
     status.services[i].label = settings.services[i].label;
     status.services[i].status = 'unknown';
     status.services[i].statusCode = 0;
diff --git a/public/index.html b/public/index.html
index 5897f6d..ef99708 100644
--- a/public/index.html
+++ b/public/index.html
@@ -44,13 +44,32 @@
           });
 
           socket.on('status', function (status) {
-            var statusTab = _.map(status.services, function(value, key) { return value; });
+            var statusTab = [];
+            var groups = [];
+
+            _.each(status.services, function(value, key) {
+              if (typeof(value.group) !== 'string') {
+                value.group = 'others';
+              }
+
+              var groupIndex = groups.indexOf(value.group);
+
+              if (groupIndex === -1) {
+                groupIndex = groups.length;
+                groups.push(value.group);
+                statusTab.push({ name:value.group, projects: []});
+              };
+
+              statusTab[groupIndex].projects.push(value);
+            });
 
             $('#summarize').empty();
             $('#projects').empty();
-            $("#projectTemplate").template("projectsList");
+
+            $("#groupTemplate").template("group");
             $("#summarizeTemplate").template("summarizeData");
-            $.tmpl("projectsList", statusTab).appendTo("#projects");
+
+            $.tmpl("group", statusTab).appendTo("#projects");
             $.tmpl("summarizeData", status.summarize).appendTo("#summarize");
           });
 
@@ -96,17 +115,30 @@
       });
     });
   </script>
-  <script id="projectTemplate" type="text/html">
-    <li class="project">
-      <h2>
-        <span class="service"><span class="strikethrough"></span><strong>${label}</strong></span>
-        <span class="status ${status} glow"><span class="strikethrough"></span><strong>${status}</strong></span>
-        <span class="code"><span class="strikethrough"></span><strong>{{if statusCode != 0 && status != 'up'}}${statusCode}{{else}}&nbsp;{{/if}}</strong></span>
-      </h2>
-      {{if message }}
-      <p class="info"><span class="label">Message:</span>${message}</p>
-      {{/if}}
-    </li>
+  <script id="groupTemplate" type="text/html">
+      <li>
+        <h1 class="legend">${name}</h1>
+
+        <div class="legend">
+          <span class="service">Service</span>
+          <span class="status">Status</span>
+          <span class="code">Code</span>
+        </div>
+        <ul>
+          {{each(i, project) projects}}
+          <li class="project">
+              <h2>
+                <span class="service"><span class="strikethrough"></span><strong>${project.label}</strong></span>
+                <span class="status ${project.status} glow"><span class="strikethrough"></span><strong>${project.status}</strong></span>
+                <span class="code"><span class="strikethrough"></span><strong>{{if project.statusCode != 0 && project.status != 'up'}}${project.statusCode}{{else}}&nbsp;{{/if}}</strong></span>
+              </h2>
+              {{if project.message }}
+              <p class="info"><span class="label">Message:</span>${project.message}</p>
+              {{/if}}
+          </li>
+          {{/each}}
+        </ul>
+      </li>
   </script>
   <script id="summarizeTemplate" type="text/html">
     <li class="project">
@@ -148,11 +180,6 @@ <h1 id="title">Services Status Dashboard</h1>
       </div>
       <div id="plugins" class="plugins">
       </div>
-      <div class="legend">
-  			<span class="service">Service</span>
-  			<span class="status">Status</span>
-  			<span class="code">Code</span>
-      </div>
       <ul id="projects"></ul>
     </div>
     <div id="footer">
diff --git a/public/styles/master.css b/public/styles/master.css
index 05648ae..829175b 100644
--- a/public/styles/master.css
+++ b/public/styles/master.css
@@ -106,6 +106,14 @@ body {
 			left: 507px;
 		}
 
+        h1.legend {
+            height:auto;
+            font-size:24px;
+            line-height:36px;
+            padding:20px 10px 0px;
+            text-align:left;
+            color: #888;
+        }
 	/* PROJECTS */
   .plugin {
     cursor: pointer;

From 6901996749a332f536cd54be1b50919027f5b55c Mon Sep 17 00:00:00 2001
From: Marc Trudel <mtrudel@wizcorp.jp>
Date: Tue, 22 Jan 2013 10:15:58 +0900
Subject: [PATCH 2/3] * Bugfix: Ftp methods were note prototype methods *
 Uncaught exception now prints stacktrace instead of just the error message

---
 bin/statusdashboard | 2 +-
 lib/sources/ftp.js  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bin/statusdashboard b/bin/statusdashboard
index d768448..4e9a6df 100755
--- a/bin/statusdashboard
+++ b/bin/statusdashboard
@@ -12,7 +12,7 @@ process.on('exit', function () {
 });
 
 process.on('uncaughtException', function(err) {
-  util.log(err);
+  util.log(err.stack.replace(/^    /gm, '                  '));
 });
 
 var dashboard = new server.dashboard(settings);
diff --git a/lib/sources/ftp.js b/lib/sources/ftp.js
index 0f5c7b3..dd4bcd3 100644
--- a/lib/sources/ftp.js
+++ b/lib/sources/ftp.js
@@ -9,14 +9,14 @@ var Ftp = function (service, stream) {
   this.stream = stream;
 };
 
-Ftp.error = function(status, message) {
+Ftp.prototype.error = function(status, message) {
   this.service.status = "down";
   this.service.statusCode = status;
   this.service.message = message;
   callback(this.service.status, this.service);
 };
 
-Ftp.command = function(command, callback) {
+Ftp.prototype.command = function(command, callback) {
 
   var self = this;
   this.stream.write(command + '\r\n');

From be677c3bd5c8a41eb879154cdd9b521450f95460 Mon Sep 17 00:00:00 2001
From: Marc Trudel <mtrudel@wizcorp.jp>
Date: Wed, 23 Jan 2013 10:38:51 +0900
Subject: [PATCH 3/3] * Bug fix: missing callback argument * Refactored ftp.js

---
 lib/sources/ftp.js | 83 +++++++++++++++++++++++++++++++---------------
 1 file changed, 57 insertions(+), 26 deletions(-)

diff --git a/lib/sources/ftp.js b/lib/sources/ftp.js
index dd4bcd3..614a8cd 100644
--- a/lib/sources/ftp.js
+++ b/lib/sources/ftp.js
@@ -4,36 +4,54 @@
 
 var net = require('net');
 
-var Ftp = function (service, stream) {
+var Ftp = function (service, stream, callback) {
   this.service = service;
   this.stream = stream;
-};
 
-Ftp.prototype.error = function(status, message) {
-  this.service.status = "down";
-  this.service.statusCode = status;
-  this.service.message = message;
-  callback(this.service.status, this.service);
+  /**
+    Actually required to get the SERVER READY out of the way
+    I am also assuming this might catch potential
+    on-connection ftp error
+    codes...
+  */
+  this.command('', callback);
 };
 
 Ftp.prototype.command = function(command, callback) {
 
-  var self = this;
   this.stream.write(command + '\r\n');
 
-  var dataCallback = function(data) {
-    self.stream.removeListener('data', dataCallback);
+  this.stream.once('data', function(data) {
 
     var status = data.toString().match(/^\d\d\d/);
 
-    if (parseInt(status[0], 10) > 399) {
-      ftp.error(self.service, status[0], data.toString());
-    } else {
-      return callback(data);
+    status = status[0] ? parseInt(status[0], 10) : 0;
+
+    /**
+      TODO?
+
+      4xx and 5xx should be treated differently. 4xx should be critical,
+      while 5xx should be (potentially) considered as down
+
+      Removed 600 from potential error responses
+    */
+    if ((status > 399 && status < 600) || status > 999) {
+      return callback(status, data.toString());
     }
-  };
 
-  self.stream.addListener('data', dataCallback);
+    return callback(null, data.toString());
+  });
+};
+
+Ftp.prototype.returnServiceStatus = function(service, status, statusCode, message, callback) {
+  service.status = status;
+  service.statusCode = statusCode;
+  service.message = message;
+
+  this.stream.end();
+  this.stream.destroy();
+
+  callback(service.status, service);
 };
 
 exports.check = function(serviceDefinition, service, callback) {
@@ -45,22 +63,35 @@ exports.check = function(serviceDefinition, service, callback) {
   var stream = net.createConnection(serviceDefinition.port, serviceDefinition.host);
 
   stream.addListener('connect', function () {
-    var ftp = new Ftp(service, stream);
-
-    ftp.command('USER ' + service.username, function(data) {
-      ftp.command('PASS ' + service.password, function(data) {
-        service.status = "up";
-        service.statusCode = 0;
-        service.message = "";
-        callback(service.status, service);
+
+    var ftp = new Ftp(service, stream, function (err, data) {
+
+      if (err) {
+        return ftp.returnServiceStatus(service, 'down', err, data, callback);
+      }
+
+      ftp.command('USER ' + serviceDefinition.username, function(err, data) {
+
+        if (err) {
+          return ftp.returnServiceStatus(service, 'critical', err, data, callback);
+        }
+
+        ftp.command('PASS ' + serviceDefinition.password, function(err, data) {
+          if (err) {
+            return ftp.returnServiceStatus(service, 'critical', err, data, callback);
+          }
+
+          return ftp.returnServiceStatus(service, 'up', 0, '', callback);
+        });
       });
     });
   });
 
   stream.addListener('error', function (e) {
-    service.status = "down";
+    service.status = 'down';
     service.statusCode = 0;
     service.message = e.message;
-    callback(service.status, service);
+
+    return callback(service.status, service);
   });
 };