Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' into feature/better-logging

Conflicts:
	server.js
  • Loading branch information...
commit fa1057e93165734568eca3158d4230b87a056c53 2 parents 7115c13 + feb5834
Marc Trudel stelcheck authored
Showing with 7 additions and 8 deletions.
  1. +1 −5 README.md
  2. +3 −1 api.js
  3. +1 −1  package.json
  4. +2 −1  server.js
6 README.md
View
@@ -3,11 +3,7 @@ Status Dashboard
Status Dashboard is status page for your configured services or applications.
-Demo:
-
-* @ [Heroku](http://heroku.com) demo: [http://statusdashboard-node.herokuapp.com](http://statusdashboard-node.herokuapp.com)
-* @ [Nodester](http://nodester.com) demo: [http://statusdashboard.nodester.com](http://statusdashboard.nodester.com)
-* @ [No.de](https://no.de) demo: [http://statusdashboard.no.de](http://statusdashboard.no.de)
+Demo @ [Heroku](http://heroku.com) : [http://statusdashboard-node.herokuapp.com](http://statusdashboard-node.herokuapp.com)
Screenshots
=======
4 api.js
View
@@ -101,7 +101,9 @@ module.exports.checkAllServices = function() {
status.services[i].statusCode = 0;
status.services[i].message = '';
- sources[settings.services[i].check].call(null, settings.services[i], status.services[i], controller.emit);
+ sources[settings.services[i].check].call(null, settings.services[i], status.services[i], function(status, service) {
+ controller.emit(status, service);
+ });
}
/**
2  package.json
View
@@ -1,6 +1,6 @@
{
"name": "statusdashboard",
- "version": "0.5.0",
+ "version": "0.6.0",
"description": "A services status dashboard",
"author": "Olivier Bazoud <olivier.bazoud@gmail.com>",
"homepage": "http://github.com/obazoud/statusdashboard.git",
3  server.js
View
@@ -4,7 +4,7 @@ var path = require('path'),
var log;
-exports.dashboard = function(settings) {
+exports.dashboard = function(settings, cb) {
var rootPath = path.dirname(module.filename),
api = require('./api'),
express = require('express'),
@@ -119,4 +119,5 @@ exports.dashboard = function(settings) {
// We make the API available for external control
this.api = api;
log('Server started.');
+ if (cb) cb();
};
Please sign in to comment.
Something went wrong with that request. Please try again.