From c6c9337752df646f3e49a8ccfee4ecbffc0d2ac4 Mon Sep 17 00:00:00 2001 From: william Date: Fri, 29 Jan 2016 18:41:50 -0500 Subject: [PATCH 1/6] removed all syntax --- lxc.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lxc.js b/lxc.js index 1446b58..d2afd83 100644 --- a/lxc.js +++ b/lxc.js @@ -7,8 +7,8 @@ var sysExec = function(command, callback){ }; var lxc = { - create: function(name, template, config, cbComplete){ - sysExec('lxc-create -n '+name+' -t '+template, cbComplete); + create: function(name, template, config, callback){ + sysExec('lxc-create -n '+name+' -t '+template, callback); }, clone: function(name, base_name, callback){ @@ -60,7 +60,7 @@ var lxc = { if(data.match("doesn't exist")){ return callback({state: 'NULL'}); } - + var info = {}; data = data.replace(/\suse/ig, '').replace(/\sbytes/ig, '').split("\n").slice(0,-1); for(var i in data){ From 5c030c36c5f5df8f678d781ea204dcc1f70e6f1e Mon Sep 17 00:00:00 2001 From: william Date: Fri, 29 Jan 2016 18:54:18 -0500 Subject: [PATCH 2/6] removed dependice on node-cdm --- lxc.js | 15 ++++++++++----- routes/api.js | 2 +- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/lxc.js b/lxc.js index d2afd83..7e0c348 100644 --- a/lxc.js +++ b/lxc.js @@ -1,10 +1,15 @@ 'use strict'; -var cmd = require('node-cmd'); +var exec = require('child_process').exec; -var sysExec = function(command, callback){ - // console.log('sysExec: ', command, '||| callback:', callback) - cmd.get('unset XDG_SESSION_ID XDG_RUNTIME_DIR; cgm movepid all virt $$; '+command, callback); -}; +function sysExec(command,callback){exec(command, + command = 'unset XDG_SESSION_ID XDG_RUNTIME_DIR; cgm movepid all virt $$; ' + command + (function(){ + return function(err,data,stderr){ + if(!callback) return; + callback(data, err, stderr); + } + })(callback) +);} var lxc = { create: function(name, template, config, callback){ diff --git a/routes/api.js b/routes/api.js index 171e226..45ceac9 100644 --- a/routes/api.js +++ b/routes/api.js @@ -6,7 +6,7 @@ var extend = require('node.extend'); var redis = require("redis"); var client = redis.createClient(); 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){ lxc.start(req.params.name, function(status, message){ if(status){ From 303065c858cc233265a05c561b3fdd341cfa81ec Mon Sep 17 00:00:00 2001 From: william Date: Fri, 29 Jan 2016 18:57:56 -0500 Subject: [PATCH 3/6] removed dependice on node-cdm --- lxc.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lxc.js b/lxc.js index 7e0c348..4bb1f6f 100644 --- a/lxc.js +++ b/lxc.js @@ -1,15 +1,15 @@ 'use strict'; var exec = require('child_process').exec; -function sysExec(command,callback){exec(command, +function sysExec(command,callback){ command = 'unset XDG_SESSION_ID XDG_RUNTIME_DIR; cgm movepid all virt $$; ' + command - (function(){ + exec(command,(function(){ return function(err,data,stderr){ if(!callback) return; callback(data, err, stderr); } - })(callback) -);} + })(callback)); +}; var lxc = { create: function(name, template, config, callback){ From 86474c9684a5d392caa16a44a2dc8c9e459ebae1 Mon Sep 17 00:00:00 2001 From: william Date: Fri, 29 Jan 2016 18:59:17 -0500 Subject: [PATCH 4/6] removed packages from package.json --- package.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index a2505c0..b83d226 100644 --- a/package.json +++ b/package.json @@ -15,9 +15,8 @@ "serve-favicon": "~2.3.0", "node.extend": "~1.1.5", "redis": "~2.4.2", - "child": "0.0.3", +/* "child": "0.0.3", "colors": "~1.1.2", - "async": "~1.5.2", - "node-cmd": "~1.1.1" + "async": "~1.5.2",*/ } } From d0bdd8e794cf8d984d5eddbe23019514954d0da4 Mon Sep 17 00:00:00 2001 From: william Date: Fri, 29 Jan 2016 18:59:47 -0500 Subject: [PATCH 5/6] removed dependice on node-cdm --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b83d226..ba92871 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "morgan": "~1.6.1", "serve-favicon": "~2.3.0", "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",*/ From fe6047b449e3ed8c16b22a7a52d054384d6581c9 Mon Sep 17 00:00:00 2001 From: william Date: Fri, 29 Jan 2016 19:00:10 -0500 Subject: [PATCH 6/6] removed dependice on node-cdm --- package.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/package.json b/package.json index ba92871..598161a 100644 --- a/package.json +++ b/package.json @@ -15,8 +15,5 @@ "serve-favicon": "~2.3.0", "node.extend": "~1.1.5", "redis": "~2.4.2" -/* "child": "0.0.3", - "colors": "~1.1.2", - "async": "~1.5.2",*/ } }