Comparing version 0.5.0-SNAPSHOT.1387334134740 to 0.5.0-SNAPSHOT.1387336774173
@@ -105,4 +105,4 @@ /* | ||
'noWorkers': argv.noWorkers || os.cpus().length, | ||
'monCreateServer': require('./monitor').monCreateServer, | ||
'monApp': require('./monitor').monApp, | ||
'monCreateServer': require('cluster-monitor').monCreateServer, | ||
'monApp': require('cluster-monitor').monApp, | ||
'monPort': argv.monPort || 8081, | ||
@@ -206,3 +206,3 @@ 'warmUpPort': argv.warmUpPort || 8083, | ||
'noWorkers': argv.noWorkers || os.cpus().length, | ||
'monCreateServer': require('./monitor').monCreateServer, | ||
'monCreateServer': require('cluster-monitor').monCreateServer, | ||
'monConfigureApp': function(monApp){ | ||
@@ -212,3 +212,3 @@ | ||
}, | ||
'monApp': require('./monitor').monApp, | ||
'monApp': require('cluster-monitor').monApp, | ||
'monPort': argv.monPort || 8081, | ||
@@ -259,7 +259,2 @@ 'runnable': options.runnable, //runnable is a function to be called without scope (closure) | ||
get monitor(){ | ||
return require('./monitor'); | ||
}, | ||
get ecv(){ | ||
@@ -266,0 +261,0 @@ |
@@ -14,6 +14,2 @@ 'use strict'; | ||
var tillMaster = when.defer(); | ||
exports.master = tillMaster.promise; | ||
var Master = exports.Master = function(proc, options){ | ||
@@ -204,7 +200,17 @@ | ||
_this.emitter.on('debug', function(pid){ | ||
_this.debug(pid); | ||
}); | ||
_this.emitter.on('pause', function(pid){ | ||
_this.pause(pid); | ||
}); | ||
_this.emitter.on('resume', function(pid){ | ||
_this.resume(pid); | ||
}); | ||
process.once('SIGINT', _.bind(_this.whenStop, _this)); | ||
process.once('SIGTERM', _.bind(_this.whenExit, _this)); | ||
tillMaster.resolve(_this); | ||
return _this; | ||
@@ -227,4 +233,2 @@ } | ||
}); | ||
tillMaster.reject(new Error('this is cache manager worker')); | ||
@@ -243,4 +247,2 @@ return new Worker(proc, options); | ||
tillMaster.reject(new Error('this is worker')); | ||
return new Worker(proc, options); | ||
@@ -247,0 +249,0 @@ } |
@@ -14,3 +14,3 @@ { | ||
"name": "cluster2", | ||
"version": "0.5.0-SNAPSHOT.1387334134740", | ||
"version": "0.5.0-SNAPSHOT.1387336774173", | ||
"engines": { | ||
@@ -22,2 +22,3 @@ "node": ">= 0.10.0" | ||
"cluster-emitter": "~0.5.0", | ||
"cluster-monitor": "~0.5.0", | ||
"cluster-status": "~0.5.0", | ||
@@ -30,10 +31,7 @@ "cluster-cache": "~0.5.0", | ||
"request": "~2.30.0", | ||
"express": "~3.1.0", | ||
"winston": "~0.7.2", | ||
"when": "~2.7.0", | ||
"ejs": "~0.8.4", | ||
"npm": "1.3.18", | ||
"usage": "~0.3.8", | ||
"gc-stats": "~0.0.1", | ||
"socket.io": "~0.9.16", | ||
"nodefly-uvmon": "~0.0.7", | ||
@@ -43,4 +41,7 @@ "node-inspector": "~0.4.0" | ||
"devDependencies": { | ||
"ejs": "~0.8.4", | ||
"mocha": "~1.11.0", | ||
"should": "~1.2.2", | ||
"express": "~3.1.0", | ||
"socket.io": "~0.9.16", | ||
"consolidate": "~0.9.1", | ||
@@ -47,0 +48,0 @@ "dustjs-helpers": "~1.1.1", |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
16
4
120217
8
12
1708
+ Addedcluster-monitor@~0.5.0
- Removedejs@~0.8.4
- Removedexpress@~3.1.0
- Removedsocket.io@~0.9.16
- Removedbuffer-crc32@0.1.10.2.13(transitive)
- Removedcommander@0.6.1(transitive)
- Removedconnect@2.7.5(transitive)
- Removedcookie@0.0.5(transitive)
- Removedcookie-signature@1.0.0(transitive)
- Removedejs@0.8.8(transitive)
- Removedexpress@3.1.2(transitive)
- Removedformidable@1.0.11(transitive)
- Removedfresh@0.1.0(transitive)
- Removedmime@1.2.6(transitive)
- Removedqs@0.5.10.6.6(transitive)
- Removedsend@0.1.0(transitive)