Merge pull request #10 from wmantly/new

New
This commit is contained in:
William Mantly 2016-02-03 17:44:59 -05:00
commit efbcf69a4a
2 changed files with 48 additions and 39 deletions

4
lxc.js
View File

@ -91,10 +91,10 @@ var lxc = {
var info = []; var info = [];
keys = keys.map(function(v){return v.toLowerCase()}); keys = keys.map(function(v){return v.toLowerCase()});
output = output.slice(0).splice(1).slice(0,-1); output = output.slice(0).slice(0,-1);
for(var i in output){ for(var i in output){
if(output[i].match(/^-/)) continue;
var aIn = output[i].split(/\s+/).slice(0,-1); var aIn = output[i].split(/\s+/).slice(0,-1);
var mapOut = {}; var mapOut = {};
aIn.map(function(value,idx){ aIn.map(function(value,idx){

View File

@ -8,26 +8,34 @@ var client = redis.createClient();
var request = require('request'); var request = require('request');
var lxc = require('../lxc'); var lxc = require('../lxc');
var runner = function(req, res, ip){
return request.post({url:'http://'+ip, form: req.body}, function(error, response, body){
body = JSON.parse(body);
body['ip'] = ip.replace('10.0.', '');
return res.json(body);
});
};
var addToRedis = function(){
lxc.info(req.params.name, null, function(data){
var domain = req.query.domain || 'vm42.us';
domain = req.params.name+'.'+domain;
client.SADD("hosts", domain, function(){});
var ip = data.ip + ':5000';
client.HSET(domain, "ip", ip, redis.print);
client.HSET(domain, "updated", (new Date).getTime(), redis.print);
client.hset(domain, "include", "proxy.include");
return res.json({status: 200, info: data});
});
};
router.get('/start/:name', function(req, res, next){ router.get('/start/:name', function(req, res, next){
lxc.start(req.params.name, function(data){ return lxc.start(req.params.name, function(data){
console.log('start', arguments); console.log('start', arguments);
if(!data){ if(!data){
res.json({status: 500, name: req.params.name, message: data}); return res.json({status: 500, name: req.params.name, message: data});
}else{ }else{
setTimeout(function() { res.json({})
lxc.info(req.params.name, null, function(data){
var domain = req.query.domain || 'vm42.us';
domain = req.params.name+'.'+domain;
client.SADD("hosts", domain, function(){});
var ip = data.ip + ':5000';
client.HSET(domain, "ip", ip, redis.print);
client.HSET(domain, "updated", (new Date).getTime(), redis.print);
client.hset(domain, "include", "proxy.include");
res.json({status: 200, info: data});
});
}, 5000);
} }
}); });
}); });
@ -84,29 +92,30 @@ router.get('/list', function(req, res, next) {
}); });
}); });
router.post('/run/:ip?', function(req, res, next){ router.post('/run/:ip?', function doRun(req, res, next){
// check if server is
var runner = function(res, req, ip){ return lxc.list(function(data){
console.log('runner on', ip,'with body:\n', JSON.stringify(req.body)); if(!req.params.ip) data = [];
return request.post({url:'http://'+ip, form: req.body}, function(error, response, body){
console.log('request args:', arguments)
body = JSON.parse(body);
body['ip'] = ip.replace('10.0.', '')
return res.json(body)
});
};
if(req.params.ip){
var ip = '10.0.'+ req.params.ip; var ip = '10.0.'+ req.params.ip;
return runner(res, req, ip); var found = false;
}else{
var name = 'u1-'+(Math.random()*100).toString().replace('.',''); for(var idx=data.length; idx--;){
console.log('new VM', name); if( data[idx]['ipv4'] === ip ){
return lxc.startEphemeral(name, 'u1', function(data){ found = true;
return runner(res, req, data.ip); break;
}); }
} }
if(found){
return runner(req, res, ip)
}else{
var name = 'u1-'+(Math.random()*100).toString().replace('.','');
return lxc.startEphemeral(name, 'u1', function(data){
return runner(req, res, data.ip);
});
}
});
}); });