From 3ac4225959febaa41936b895b3665b4e5b2035eb Mon Sep 17 00:00:00 2001 From: william Date: Fri, 29 Jan 2016 17:44:40 -0500 Subject: [PATCH 1/5] added strict --- routes/index.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/routes/index.js b/routes/index.js index 4769599..1e3da66 100644 --- a/routes/index.js +++ b/routes/index.js @@ -1,11 +1,12 @@ +'use strict'; + var express = require('express'); var router = express.Router(); var extend = require('node.extend'); var redis = require("redis"); var client = redis.createClient(); -var lxc = require('../lxc')({sshBind: false/*['/usr/bin/ssh', 'virt@127.0.0.1']*/}); +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 33ea561f6aebcf2e23fc9e65fed219c73010b96b Mon Sep 17 00:00:00 2001 From: william Date: Fri, 29 Jan 2016 17:45:10 -0500 Subject: [PATCH 2/5] added strict --- lxc.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lxc.js b/lxc.js index b8d524b..69efd16 100644 --- a/lxc.js +++ b/lxc.js @@ -1,3 +1,5 @@ +'use strict'; + module.exports = function(config){ var obj = {}; var cmd = require('node-cmd'); From 5520d0b499bcb78fc84af564019bc184dfb9bf1f Mon Sep 17 00:00:00 2001 From: william Date: Fri, 29 Jan 2016 17:48:32 -0500 Subject: [PATCH 3/5] added strict --- app.js | 8 ++--- routes/api.js | 81 +++++++++++++++++++++++++++++++++++++++++++++++++ routes/index.js | 78 ++--------------------------------------------- routes/users.js | 9 ------ 4 files changed, 88 insertions(+), 88 deletions(-) create mode 100644 routes/api.js delete mode 100644 routes/users.js diff --git a/app.js b/app.js index 83fefb3..d12c9dc 100644 --- a/app.js +++ b/app.js @@ -5,8 +5,8 @@ var logger = require('morgan'); var cookieParser = require('cookie-parser'); var bodyParser = require('body-parser'); -var routes = require('./routes/index'); -var users = require('./routes/users'); +var APIroutes = ; +var users = ; var app = express(); @@ -22,8 +22,8 @@ app.use(bodyParser.urlencoded({ extended: false })); app.use(cookieParser()); app.use(express.static(path.join(__dirname, 'public'))); -app.use('/', users); -app.use('/api', routes); +app.use('/', require('./routes/index')); +app.use('/api', require('./routes/api')); // catch 404 and forward to error handler app.use(function(req, res, next) { diff --git a/routes/api.js b/routes/api.js new file mode 100644 index 0000000..1e3da66 --- /dev/null +++ b/routes/api.js @@ -0,0 +1,81 @@ +'use strict'; + +var express = require('express'); +var router = express.Router(); +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){ + res.json({status: 500, name: req.params.name, message: message}); + }else{ + setTimeout(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"); + res.json({status: 200, info: data}); + }); + }, 5000); + + } + }); +}); + +router.get('/live/:template/:name', function(req, res, next){ + lxc.startEphemeral(req.params.name, req.params.template, function (data) { + res.json(data); + }); +}); + +router.get('/stop/:name', function(req, res, next){ + lxc.stop(req.params.name, function(data, message){ + if(data){ + res.json({status: 500, name: req.params.name, message: message}); + }else{ + res.json({status: 200}); + } + }); +}); + +router.get('/clone/:template/:name', function(req, res, next){ + lxc.clone(req.params.name, req.params.template, function(message){ + if( message.match(/Created container/) ){ + res.json({status: 200}); + }else{ + res.json({status: 500, message: message}); + } + }); +}); + +router.get('/destroy/:name', function(req, res, next){ + lxc.destroy(req.params.name, function(data){ + if(data){ + res.json({status: 500, message: data}); + }else{ + res.json({status: 200}); + } + }); +}); + +router.get('/info/:name', function(req, res, next){ + lxc.info(req.params.name, function(data){ + res.json(data); + }); +}); + +router.get('/list', function(req, res, next) { + lxc.list(function(data){ + res.json(data); + }); +}); + +module.exports = router; diff --git a/routes/index.js b/routes/index.js index 1e3da66..d30f494 100644 --- a/routes/index.js +++ b/routes/index.js @@ -1,81 +1,9 @@ -'use strict'; - var express = require('express'); var router = express.Router(); -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){ - res.json({status: 500, name: req.params.name, message: message}); - }else{ - setTimeout(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"); - res.json({status: 200, info: data}); - }); - }, 5000); - } - }); -}); - -router.get('/live/:template/:name', function(req, res, next){ - lxc.startEphemeral(req.params.name, req.params.template, function (data) { - res.json(data); - }); -}); - -router.get('/stop/:name', function(req, res, next){ - lxc.stop(req.params.name, function(data, message){ - if(data){ - res.json({status: 500, name: req.params.name, message: message}); - }else{ - res.json({status: 200}); - } - }); -}); - -router.get('/clone/:template/:name', function(req, res, next){ - lxc.clone(req.params.name, req.params.template, function(message){ - if( message.match(/Created container/) ){ - res.json({status: 200}); - }else{ - res.json({status: 500, message: message}); - } - }); -}); - -router.get('/destroy/:name', function(req, res, next){ - lxc.destroy(req.params.name, function(data){ - if(data){ - res.json({status: 500, message: data}); - }else{ - res.json({status: 200}); - } - }); -}); - -router.get('/info/:name', function(req, res, next){ - lxc.info(req.params.name, function(data){ - res.json(data); - }); -}); - -router.get('/list', function(req, res, next) { - lxc.list(function(data){ - res.json(data); - }); +/* GET users listing. */ +router.get('/', function(req, res, next) { + res.render('index') }); module.exports = router; diff --git a/routes/users.js b/routes/users.js deleted file mode 100644 index d30f494..0000000 --- a/routes/users.js +++ /dev/null @@ -1,9 +0,0 @@ -var express = require('express'); -var router = express.Router(); - -/* GET users listing. */ -router.get('/', function(req, res, next) { - res.render('index') -}); - -module.exports = router; From 9f9f84e39e24433b1ff4eb8bedf878dccd5db769 Mon Sep 17 00:00:00 2001 From: william Date: Fri, 29 Jan 2016 17:48:51 -0500 Subject: [PATCH 4/5] added strict --- app.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/app.js b/app.js index d12c9dc..5555393 100644 --- a/app.js +++ b/app.js @@ -4,10 +4,6 @@ var favicon = require('serve-favicon'); var logger = require('morgan'); var cookieParser = require('cookie-parser'); var bodyParser = require('body-parser'); - -var APIroutes = ; -var users = ; - var app = express(); // view engine setup From cb7b084fe262aa43041ea71e7e473e3bdaad4d7e Mon Sep 17 00:00:00 2001 From: william Date: Fri, 29 Jan 2016 17:52:20 -0500 Subject: [PATCH 5/5] added strict --- lxc.js | 4 ++-- routes/api.js | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lxc.js b/lxc.js index 69efd16..59c70d3 100644 --- a/lxc.js +++ b/lxc.js @@ -13,8 +13,8 @@ module.exports = function(config){ sysExec('lxc-create -n '+name+' -t '+template, cbComplete); }; - obj.clone = function(name, base_name, cbComplete, cbData){ - sysExec('lxc-clone -o '+base_name+ ' -n '+name +' -B overlayfs -s', cbComplete, cbData); + obj.clone = function(name, base_name, callback){ + sysExec('lxc-clone -o '+base_name+ ' -n '+name +' -B overlayfs -s', callback); }; obj.destroy = function(name, callback){ diff --git a/routes/api.js b/routes/api.js index 1e3da66..1236a40 100644 --- a/routes/api.js +++ b/routes/api.js @@ -47,11 +47,11 @@ router.get('/stop/:name', function(req, res, next){ }); router.get('/clone/:template/:name', function(req, res, next){ - lxc.clone(req.params.name, req.params.template, function(message){ - if( message.match(/Created container/) ){ + lxc.clone(req.params.name, req.params.template, function(data){ + if( data.match(/Created container/) ){ res.json({status: 200}); }else{ - res.json({status: 500, message: message}); + res.json({status: 500, message: data}); } }); });