Merge pull request #5 from wmantly/new

New
This commit is contained in:
William Mantly 2016-01-29 19:03:29 -05:00
commit 9953318982
3 changed files with 14 additions and 13 deletions

19
lxc.js
View File

@ -1,14 +1,19 @@
'use strict'; 'use strict';
var cmd = require('node-cmd'); var exec = require('child_process').exec;
var sysExec = function(command, callback){ function sysExec(command,callback){
// console.log('sysExec: ', command, '||| callback:', callback) command = 'unset XDG_SESSION_ID XDG_RUNTIME_DIR; cgm movepid all virt $$; ' + command
cmd.get('unset XDG_SESSION_ID XDG_RUNTIME_DIR; cgm movepid all virt $$; '+command, callback); exec(command,(function(){
return function(err,data,stderr){
if(!callback) return;
callback(data, err, stderr);
}
})(callback));
}; };
var lxc = { var lxc = {
create: function(name, template, config, cbComplete){ create: function(name, template, config, callback){
sysExec('lxc-create -n '+name+' -t '+template, cbComplete); sysExec('lxc-create -n '+name+' -t '+template, callback);
}, },
clone: function(name, base_name, callback){ clone: function(name, base_name, callback){
@ -60,7 +65,7 @@ var lxc = {
if(data.match("doesn't exist")){ if(data.match("doesn't exist")){
return callback({state: 'NULL'}); return callback({state: 'NULL'});
} }
var info = {}; var info = {};
data = data.replace(/\suse/ig, '').replace(/\sbytes/ig, '').split("\n").slice(0,-1); data = data.replace(/\suse/ig, '').replace(/\sbytes/ig, '').split("\n").slice(0,-1);
for(var i in data){ for(var i in data){

View File

@ -14,10 +14,6 @@
"morgan": "~1.6.1", "morgan": "~1.6.1",
"serve-favicon": "~2.3.0", "serve-favicon": "~2.3.0",
"node.extend": "~1.1.5", "node.extend": "~1.1.5",
"redis": "~2.4.2", "redis": "~2.4.2"
"child": "0.0.3",
"colors": "~1.1.2",
"async": "~1.5.2",
"node-cmd": "~1.1.1"
} }
} }

View File

@ -6,7 +6,7 @@ var extend = require('node.extend');
var redis = require("redis"); var redis = require("redis");
var client = redis.createClient(); var client = redis.createClient();
var lxc = require('../lxc'); var lxc = require('../lxc');
//lxc.startEphemeral('ubuntu_template', 'ue0', function(){console.log('cb1', arguments)}, function(){console.log('cb2', arguments)})
router.get('/start/:name', function(req, res, next){ router.get('/start/:name', function(req, res, next){
lxc.start(req.params.name, function(status, message){ lxc.start(req.params.name, function(status, message){
if(status){ if(status){