Merge pull request #10 from wmantly/new

New

lxc.js

@@ -91,10 +91,10 @@ var lxc = {
 			var info = [];
 
 			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){   
-
+				if(output[i].match(/^-/)) continue;
 				var aIn = output[i].split(/\s+/).slice(0,-1);
 				var mapOut = {};
 				aIn.map(function(value,idx){

routes/api.js

@@ -8,13 +8,14 @@ var client = redis.createClient();
 var request = require('request');
 var lxc = require('../lxc');
 
-router.get('/start/:name', function(req, res, next){
+var runner = function(req, res, ip){
-	lxc.start(req.params.name, function(data){
+	return request.post({url:'http://'+ip, form: req.body}, function(error, response, body){
-		console.log('start', arguments);
+		body = JSON.parse(body);
-		if(!data){
+		body['ip'] = ip.replace('10.0.', '');
-			res.json({status: 500, name: req.params.name, message: data});
+		return res.json(body);
-		}else{
+	});
-			setTimeout(function() {
+};
+var addToRedis = function(){
 	lxc.info(req.params.name, null, function(data){
 			var domain = req.query.domain || 'vm42.us';
 			domain = req.params.name+'.'+domain;
@@ -24,10 +25,17 @@ router.get('/start/:name', function(req, res, next){
 			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});
+			return res.json({status: 200, info: data});
 	 });
-			}, 5000);
+};
 
+router.get('/start/:name', function(req, res, next){
+	return lxc.start(req.params.name, function(data){
+		console.log('start', arguments);
+		if(!data){
+			return res.json({status: 500, name: req.params.name, message: data});
+		}else{
+			res.json({})
 		}
 	});
 });
@@ -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;
-		return runner(res, req, ip);
+		var found = false;
+
+		for(var idx=data.length; idx--;){
+			if( data[idx]['ipv4'] === ip ){
+				found = true;
+				break;
+			}
+		}
+
+		if(found){
+			return runner(req, res, ip)
 		}else{
 			var name = 'u1-'+(Math.random()*100).toString().replace('.','');
-		console.log('new VM', name);
 			return lxc.startEphemeral(name, 'u1', function(data){
-			return runner(res, req, data.ip);
+				return runner(req, res, data.ip);
 			});
 		}
+	});
 
 });