wmantly/lxc_manager_node
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed tag prepend hardcoded issue

Browse Source
This commit is contained in:
William Mantly 2017-10-08 20:42:19 -04:00
parent 8c64959482
commit b45f45153f
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
routes/api.js
View File

@ -12,6 +12,9 @@ var settings = require('./workers.json');
// mapping of current used runners for quick loop up based on runner label // mapping of current used runners for quick loop up based on runner label
var label2runner = {}; var label2runner = {};
//
var tagPrefix = settings.tagPrefix || 'clwV';
var workers = (function(){ var workers = (function(){
// works array constructor. This will hold the works(order by creation) and all // works array constructor. This will hold the works(order by creation) and all
// the methods interacting with the workers. // the methods interacting with the workers.
@ -45,7 +48,7 @@ var workers = (function(){
image: workers.settings.image, image: workers.settings.image,
size: workers.settings.size, size: workers.settings.size,
onCreate: function(data){ onCreate: function(data){
doapi.dropletSetTag('clwV'+workers.settings.version, data.droplet.id); doapi.dropletSetTag(tagPrefix+workers.settings.version, data.droplet.id);
}, },
onActive: function(worker, args){ onActive: function(worker, args){
workers.startRunners({ workers.startRunners({
@ -116,7 +119,7 @@ var workers = (function(){
workers.destroyByTag = function(tag){ workers.destroyByTag = function(tag){
// Delete works that with // Delete works that with
tag = tag || 'clwV' + workers.settings.version; tag = tag || tagPrefix + workers.settings.version;
var currentIDs = workers.__workersId(); var currentIDs = workers.__workersId();
var deleteDroplets = function(droplets){ var deleteDroplets = function(droplets){
@ -258,7 +261,7 @@ var workers = (function(){
}; };
// make sure Digital Ocean has a tag for the current worker version // make sure Digital Ocean has a tag for the current worker version
doapi.tagCreate('clwV'+workers.settings.version); doapi.tagCreate(tagPrefix+workers.settings.version);
return workers; return workers;
@ -384,8 +387,8 @@ router.post('/updateID', function(req, res, next){
minAvail: req.query.minAvail || workers.settings minAvail: req.query.minAvail || workers.settings
}; };
doapi.tagCreate('clwV'+newWorkers.version); doapi.tagCreate(tagPrefix+newWorkers.version);
workers.destroyByTag('clwV'+newWorkers.version); workers.destroyByTag(tagPrefix+newWorkers.version);
for(var i=0; i<newWorkers.target; i++){ for(var i=0; i<newWorkers.target; i++){
@ -395,7 +398,7 @@ router.post('/updateID', function(req, res, next){
image: newWorkers.image, image: newWorkers.image,
size: newWorkers.size, size: newWorkers.size,
onCreate: function(data, args){ onCreate: function(data, args){
doapi.dropletSetTag('clwV'+args.newWorkers.version, data.droplet.id); doapi.dropletSetTag(tagPrefix+args.newWorkers.version, data.droplet.id);
}, },
onActive: function(droplet, args){ onActive: function(droplet, args){
workers.startRunners({ workers.startRunners({

5
testAPI.js
View File

@ -1,6 +1,6 @@
const request = require('request'); const request = require('request');
var till = 5; var till = 15;
var completed = 0; var completed = 0;
var errors = 0; var errors = 0;
@ -9,7 +9,8 @@ for(let i=0; i<till; i++){
let httpOptions = { let httpOptions = {
url: 'http://codeland.bytedev.co:2000/api/run', url: 'http://codeland.bytedev.co:2000/api/run',
form: { form: {
code: `python3 -c "print(1)"` code: `python3 -c "print(1)"`,
once: true,
} }
}; };
request.post(httpOptions, function(error, response, body){ request.post(httpOptions, function(error, response, body){