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

stuff

Browse Source
This commit is contained in:
William Mantly 2016-05-30 21:18:02 -04:00
parent 9072167e65
commit 9bb9809f51
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
routes/api.js
View File

@ -70,7 +70,7 @@ var workers = (function(){
worker.index = workers.length, worker.index = workers.length,
worker.getRunner = function(){ worker.getRunner = function(){
if(this.availrunners.length === 0) return false; if(this.availrunners.length === 0) return false;
console.log('geting runner from ', worker.name, ' aval length ', this.availrunners.length); console.log('getting runner from ', worker.name, ' avail length ', this.availrunners.length);
var runner = this.availrunners.pop(); var runner = this.availrunners.pop();
this.usedrunner++; this.usedrunner++;
label2runner[runner.label] = runner; label2runner[runner.label] = runner;
@ -126,8 +126,8 @@ var workers = (function(){
for(var i=minWorkers-workers.length; i--;) workers.create(); for(var i=minWorkers-workers.length; i--;) workers.create();
return ; return ;
} }
if(workers[workers.length-3].usedrunner !== 0){ if(workers[workers.length-3].usedrunner !== 0 && workers[workers.length-2].usedrunner !== 0 && workers[workers.length-1].usedrunner !== 0){
console.log('last droplet has no free runners, starting droplet'); console.log('last 3 workers have no free runners, starting droplet');
return workers.create(); return workers.create();
} }
if(workers.length > minWorkers && workers[workers.length-3].usedrunner === 0 && workers[workers.length-2].usedrunner === 0 && workers[workers.length-1].usedrunner === 0){ if(workers.length > minWorkers && workers[workers.length-3].usedrunner === 0 && workers[workers.length-2].usedrunner === 0 && workers[workers.length-1].usedrunner === 0){
@ -171,7 +171,7 @@ var runnerFree = function(runner){
}; };
var lxcTimeout = function(runner, time){ var lxcTimeout = function(runner, time){
time = time || 900000; // 15 minutes time = time || 300000; // 5 minutes
if(runner.hasOwnProperty('timeout')){ if(runner.hasOwnProperty('timeout')){
clearTimeout(runner.timeout); clearTimeout(runner.timeout);
@ -182,8 +182,9 @@ var lxcTimeout = function(runner, time){
}, time); }, time);
}; };
var run = function(req, res, runner){ var run = function(req, res, runner, count){
count = count || 0;
var httpOptions = { var httpOptions = {
url: 'http://' + runner.worker.ip, url: 'http://' + runner.worker.ip,
headers: { headers: {
@ -194,9 +195,13 @@ var run = function(req, res, runner){
}) })
}; };
if(!runner || count > 3){
return res.status(503).json({ error: 'No runners, try again soon.' });
}
return request.post(httpOptions, function(error, response, body){ return request.post(httpOptions, function(error, response, body){
// console.log('runner response:', arguments) // console.log('runner response:', arguments)
if(error || response.statusCode !== 200) return run(req, res, getAvailrunner()); if(error || response.statusCode !== 200) return run(req, res, getAvailrunner(), ++count);
body = JSON.parse(body); body = JSON.parse(body);
body['ip'] = runner.label; body['ip'] = runner.label;