Merge pull request #2 from wmantly/new

New

lxc.js

@@ -6,41 +6,6 @@ module.exports = function(config){
 		// console.log('sysExec: ', command, '||| callback:', callback)
 		cmd.get('unset XDG_SESSION_ID XDG_RUNTIME_DIR; cgm movepid all virt $$; '+command, callback)
 	}
-/*    var obj = {};
-    var child = require('child'),
-        sshBind = config.sshBind || false;
-
-    //http://stackoverflow.com/questions/10530532/
-    function textToArgs(s){
-        var words = [];
-        s.replace(/"([^"]*)"|'([^']*)'|(\S+)/g,function(g0,g1,g2,g3){ words.push(g1 || g2 || g3 || '')});            
-        return words;
-    }
-
-    var sysExec = function(command, onData, onClose){
-
-        onData = onData || function(){};
-        onClose = onClose || function(){};
-
-        if (sshBind != false)
-        {
-            var runCommand = sshBind.slice();
-            runCommand.push(command);
-        } else {
-            var runCommand = textToArgs('unset XDG_SESSION_ID XDG_RUNTIME_DIR; cgm movepid all virt $$; '+command);
-        }
-
-        var errors = '';
-
-        child({
-            command: runCommand.slice(0,1)[0],
-            args: runCommand.slice(1),
-            cbStdout: function(data){ onData(''+data) },
-            cbStderr: function(data){ errors+=data; onData(''+data) },
-            cbClose: function(exitCode){ onClose(exitCode == 0 ? null:exitCode,  errors) }
-        }).start();
-    };
-*/
 
 	obj.create = function(name, template, config, cbComplete){
 		sysExec('lxc-create -n '+name+' -t '+template, cbComplete);
@@ -63,7 +28,6 @@ module.exports = function(config){
 	};
 	
 	obj.startEphemeral = function(name, base_name, callback){
-
 		var output = '';
 		sysExec('lxc-start-ephemeral -o '+base_name+ ' -n '+name +' --union-type overlayfs -d', function(data){
 			if(data.match("doesn't exist.")) return callback({status: 500, error: "doesn't exist."});
@@ -78,17 +42,15 @@ module.exports = function(config){
 		sysExec('lxc-stop -n '+ name, callback);
 	};
 
-
+	obj.freeze = function(name, callback){
-    obj.freeze = function(name, cbComplete, cbData){
+		sysExec('lxc-freeze -n '+name, callback);
-        sysExec('lxc-freeze -n '+name, cbComplete, cbData);
 	};
 	
-    obj.unfreeze = function(name, cbComplete, cbData){
+	obj.unfreeze = function(name, callback){
-        sysExec('lxc-unfreeze -n '+name, cbComplete, cbData);
+		sysExec('lxc-unfreeze -n '+name, callback);
 	};
 	
 	obj.info = function(name, callback){
-        
 		var output = '';
 		sysExec('lxc-info -n '+name, function(data){
 			console.log('info', name, data)

routes/index.js

@@ -78,4 +78,3 @@ router.get('/list', function(req, res, next) {
 });
 
 module.exports = router;
-// {"changed":true,"filter":false,"title":"index.js","tooltip":"/routes/index.js","value":"var express = require('express');\nvar router = express.Router();\nvar extend = require('node.extend');\nvar redis = require(\"redis\");\nvar client = redis.createClient();\nvar lxc = require('../lxc')({sshBind: ['/usr/bin/ssh', 'virt@127.0.0.1']});\n//lxc.startEphemeral('ubuntu_template', 'ue0', function(){console.log('cb1', arguments)}, function(){console.log('cb2', arguments)})\n\nrouter.get('/start/:name', function(req, res, next){\n    lxc.start(req.params.name, null, function(status, message){\n       if(status){\n           res.json({status: 500, name: req.params.name, message: message});\n       }else{\n           setTimeout(function() {\n                lxc.info(req.params.name, null, function(data){\n                    var domain = req.query.domain || 'vm42.us';\n                    domain = req.params.name+'.'+domain;\n                    client.SADD(\"hosts\", domain, function(){});\n                    \n                    var ip = data.ip + ':5000';\n                    client.HSET(domain, \"ip\", ip, redis.print);\n                    client.HSET(domain, \"updated\", (new Date).getTime(), redis.print);\n                    client.hset(domain, \"include\", \"proxy.include\");\n                    res.json({status: 200, info: data});\n               });\n           }, 5000);\n\n       }\n    });\n});\n\nrouter.get('/live/:template/:name', function(req, res, next){\n    lxc.startEphemeral(req.params.name, req.params.template, null, function (data) {\n        res.json(data);\n    });\n});\n\nrouter.get('/stop/:name', function(req, res, next){\n    lxc.stop(req.params.name, null, function(data, message){\n        if(data){\n           res.json({status: 500, name: req.params.name, message: message});\n       }else{\n           res.json({status: 200});\n       }\n    });\n});\n\nrouter.get('/clone/:template/:name', function(req, res, next){\n    lxc.clone(req.params.name, req.params.template, function(message){\n        if( message.match(/Created container/) ){\n            res.json({status: 200});\n        }else{\n            res.json({status: 500, message: message});\n        }\n    });\n});\n\nrouter.get('/destroy/:name', function(req, res, next){\n    lxc.destroy(req.params.name, null, function(data, message){\n        if(data){\n            res.json({status: 500, message: message});\n        }else{\n            res.json({status: 200});\n        }\n    });\n});\n\nrouter.get('/info/:name', function(req, res, next){\n    lxc.info(req.params.name, null, function(data){\n        res.json(data);\n    });\n});\n\nrouter.get('/list', function(req, res, next) {\n    lxc.list(function(data){\n        res.json(data); \n    });\n});\n\nmodule.exports = router;","undoManager":{"mark":90,"position":100,"stack":[[{"start":{"row":32,"column":27},"end":{"row":32,"column":30},"action":"remove","lines":["par"],"id":37},{"start":{"row":32,"column":27},"end":{"row":32,"column":33},"action":"insert","lines":["params"]}],[{"start":{"row":32,"column":33},"end":{"row":32,"column":34},"action":"insert","lines":["."],"id":38}],[{"start":{"row":32,"column":34},"end":{"row":32,"column":35},"action":"insert","lines":["n"],"id":39}],[{"start":{"row":32,"column":35},"end":{"row":32,"column":36},"action":"insert","lines":["a"],"id":40}],[{"start":{"row":32,"column":36},"end":{"row":32,"column":37},"action":"insert","lines":["m"],"id":41}],[{"start":{"row":32,"column":37},"end":{"row":32,"column":38},"action":"insert","lines":["e"],"id":42}],[{"start":{"row":32,"column":38},"end":{"row":32,"column":39},"action":"insert","lines":[","],"id":43}],[{"start":{"row":32,"column":39},"end":{"row":32,"column":40},"action":"insert","lines":[" "],"id":44}],[{"start":{"row":32,"column":40},"end":{"row":32,"column":41},"action":"insert","lines":["p"],"id":45}],[{"start":{"row":32,"column":41},"end":{"row":32,"column":42},"action":"insert","lines":["a"],"id":46}],[{"start":{"row":32,"column":42},"end":{"row":32,"column":43},"action":"insert","lines":["q"],"id":47}],[{"start":{"row":32,"column":42},"end":{"row":32,"column":43},"action":"remove","lines":["q"],"id":48}],[{"start":{"row":32,"column":41},"end":{"row":32,"column":42},"action":"remove","lines":["a"],"id":49}],[{"start":{"row":32,"column":40},"end":{"row":32,"column":41},"action":"remove","lines":["p"],"id":50}],[{"start":{"row":32,"column":40},"end":{"row":32,"column":41},"action":"insert","lines":["r"],"id":51}],[{"start":{"row":32,"column":41},"end":{"row":32,"column":42},"action":"insert","lines":["e"],"id":52}],[{"start":{"row":32,"column":42},"end":{"row":32,"column":43},"action":"insert","lines":["q"],"id":53}],[{"start":{"row":32,"column":43},"end":{"row":32,"column":44},"action":"insert","lines":[","],"id":54}],[{"start":{"row":32,"column":43},"end":{"row":32,"column":44},"action":"remove","lines":[","],"id":55}],[{"start":{"row":32,"column":43},"end":{"row":32,"column":44},"actio
Line truncated