Permalink
Browse files

Merge pull request #547 from prabhakhar/master

Upgrade to latest cluster2 and pass in monitor app
  • Loading branch information...
2 parents f8ee2ac + 2bd77ff commit de9c0c6fc04c78767b42322e67f4628fe32612b1 @hochang hochang committed Aug 28, 2012
Showing with 11 additions and 8 deletions.
  1. +3 −3 modules/app/lib/main.js
  2. +3 −3 modules/app/package.json
  3. +4 −1 modules/console/app.js
  4. +1 −1 modules/console/package.json
@@ -112,15 +112,15 @@ exports.exec = function() {
cluster.listen(
// Create an app and call back
function(cb2) {
- createConsole(options, cluster, function(app, e) {
+ createConsole(options, cluster, function(app, monApp, e) {
emitter = e;
- cb2(app);
+ cb2(app, monApp);
})
},
// Cluster is ready
function(app) {
if(cb) {
- cb(app, program, emitter);
+ cb(app, monApp, program, emitter);
}
}
);
@@ -1,7 +1,7 @@
{
"author": "ql.io",
"name": "ql.io-app",
- "version": "0.8.3",
+ "version": "0.8.4",
"repository": {
"type": "git",
"url": "https://github.com/ql-io/ql.io"
@@ -15,14 +15,14 @@
},
"dependencies": {
"commander": "1.0.0",
- "ql.io-console": "0.8.2",
+ "ql.io-console": "0.8.3",
"ql.io-compiler": "0.8.1",
"winston": "0.6.2",
"express": "2.5.11",
"underscore": "1.3.3",
"mustache": "0.4.0",
"headers": "0.9.6",
- "cluster2": "0.3.4"
+ "cluster2": "0.3.5"
},
"devDependencies": {
"nodeunit": "0.7.4"
@@ -56,6 +56,9 @@ var Console = module.exports = function(opts, cb) {
var app = this.app = express.createServer();
+ // Monitor App to provide VI page, markup/markdown feature.
+ var monApp = this.monApp = express.createServer();
+
// Remains true until the app receives a 'close' event. Once this event is received, the app
// sends 'connection: close' on responses (except for express served responses) and ends
// the connection. See the app.on('close') handler below.
@@ -997,6 +1000,6 @@ var Console = module.exports = function(opts, cb) {
// The caller gets the app and the engine/event emitter
if(cb) {
- cb(app, engine);
+ cb(app, monApp, engine);
}
};
@@ -1,7 +1,7 @@
{
"author": "ql.io",
"name": "ql.io-console",
- "version": "0.8.2",
+ "version": "0.8.3",
"repository": {
"type": "git",
"url": "https://github.com/ql-io/ql.io"

0 comments on commit de9c0c6

Please sign in to comment.