wmantly/lxc_manager_node
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

asd #1

Closed
wmantly wants to merge 44 commits from refactor-workers into master
pull from: refactor-workers
merge into: wmantly:master
Conversation 0 Commits 44 Files Changed 8 +4 -4
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a1a85b2c69 - Show all commits

6
routes/worker_collection.js
View File

@ -105,9 +105,9 @@ var Worker = (function(){
};
proto.startRunners = function(args){
console.log('Starting runners on', args.worker.name, args.worker.ip);
var worker = this;
console.log('Starting runners on', worker.name, worker.ip);
// dont make runners on out dated workers
if(!worker || worker.settings.image > worker.image.id){
console.log(`Blocked outdated worker(${worker.image.id}), current image ${args.settings.image}.`)
@ -354,7 +354,7 @@ var WorkerCollection = (function(){
// if there are workers being created, stop scale up and down check
var skipBalance = workers.currentCreating + workers.length >= workers.settings.min
if(skipBalance || workers.currentCreating){
if(workers.currentCreating && skipBalance){
return console.log(`Killing balance, workers are being created.`);
}

2
testAPI.js
View File

@ -63,4 +63,4 @@ let __do = function(till){
setTimeout(__do, 1500, --till);
};
__do(500);
__do(1000);