Skip to content

Commit

Permalink
Upgrade to latest cluster2 and pass in monitor app
Browse files Browse the repository at this point in the history
  • Loading branch information
prabhakhar committed Aug 27, 2012
1 parent f8ee2ac commit 2bd77ff
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 8 deletions.
6 changes: 3 additions & 3 deletions modules/app/lib/main.js
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -112,15 +112,15 @@ exports.exec = function() {
cluster.listen( cluster.listen(
// Create an app and call back // Create an app and call back
function(cb2) { function(cb2) {
createConsole(options, cluster, function(app, e) { createConsole(options, cluster, function(app, monApp, e) {
emitter = e; emitter = e;
cb2(app); cb2(app, monApp);
}) })
}, },
// Cluster is ready // Cluster is ready
function(app) { function(app) {
if(cb) { if(cb) {
cb(app, program, emitter); cb(app, monApp, program, emitter);
} }
} }
); );
Expand Down
6 changes: 3 additions & 3 deletions modules/app/package.json
Original file line number Original file line Diff line number Diff line change
@@ -1,7 +1,7 @@
{ {
"author": "ql.io", "author": "ql.io",
"name": "ql.io-app", "name": "ql.io-app",
"version": "0.8.3", "version": "0.8.4",
"repository": { "repository": {
"type": "git", "type": "git",
"url": "https://github.com/ql-io/ql.io" "url": "https://github.com/ql-io/ql.io"
Expand All @@ -15,14 +15,14 @@
}, },
"dependencies": { "dependencies": {
"commander": "1.0.0", "commander": "1.0.0",
"ql.io-console": "0.8.2", "ql.io-console": "0.8.3",
"ql.io-compiler": "0.8.1", "ql.io-compiler": "0.8.1",
"winston": "0.6.2", "winston": "0.6.2",
"express": "2.5.11", "express": "2.5.11",
"underscore": "1.3.3", "underscore": "1.3.3",
"mustache": "0.4.0", "mustache": "0.4.0",
"headers": "0.9.6", "headers": "0.9.6",
"cluster2": "0.3.4" "cluster2": "0.3.5"
}, },
"devDependencies": { "devDependencies": {
"nodeunit": "0.7.4" "nodeunit": "0.7.4"
Expand Down
5 changes: 4 additions & 1 deletion modules/console/app.js
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -56,6 +56,9 @@ var Console = module.exports = function(opts, cb) {


var app = this.app = express.createServer(); 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 // 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 // sends 'connection: close' on responses (except for express served responses) and ends
// the connection. See the app.on('close') handler below. // the connection. See the app.on('close') handler below.
Expand Down Expand Up @@ -997,6 +1000,6 @@ var Console = module.exports = function(opts, cb) {


// The caller gets the app and the engine/event emitter // The caller gets the app and the engine/event emitter
if(cb) { if(cb) {
cb(app, engine); cb(app, monApp, engine);
} }
}; };
2 changes: 1 addition & 1 deletion modules/console/package.json
Original file line number Original file line Diff line number Diff line change
@@ -1,7 +1,7 @@
{ {
"author": "ql.io", "author": "ql.io",
"name": "ql.io-console", "name": "ql.io-console",
"version": "0.8.2", "version": "0.8.3",
"repository": { "repository": {
"type": "git", "type": "git",
"url": "https://github.com/ql-io/ql.io" "url": "https://github.com/ql-io/ql.io"
Expand Down

0 comments on commit 2bd77ff

Please sign in to comment.