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

updated logic and names

Browse Source
This commit is contained in:
Thomas Harvey 2017-10-16 19:27:18 -04:00
parent 178838366c
commit 32a338437e
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
allocate_runners.sh
View File

@ -18,7 +18,7 @@ until [[ $memory -gt $maxMemoryUsage ]]; do
lxc-start-ephemeral -o $baseName -n $runnerName --union-type overlayfs -d; lxc-start-ephemeral -o $baseName -n $runnerName --union-type overlayfs -d;
if [[ $? -eq 0 ]]; then if [[ $? -eq 0 ]]; then
runners="${runnerName};${runners}"; runners="${runners};${runnerName}";
fi fi
usedMemoryPercent; usedMemoryPercent;
done done

21
routes/worker_collection.js
View File

@ -143,7 +143,7 @@ var Worker = (function(){
}); });
}; };
proto.initialize = function(callback, config){ proto.initialize = function(hooks, config){
// Create droplet // Create droplet
// Once active the droplet begins to create runners // Once active the droplet begins to create runners
doapi.dropletToActive({ doapi.dropletToActive({
@ -158,7 +158,7 @@ var Worker = (function(){
}, },
onActive: function(data, args){ onActive: function(data, args){
var worker = Worker.create(data); var worker = Worker.create(data);
worker.newStartRunners(callback); worker.newStartRunners(hooks);
} }
}); });
}; };
@ -195,13 +195,14 @@ var Worker = (function(){
console.log(arguments); console.log(arguments);
var runners = data.split(";"); var runners = data.split(";");
for (let idx = 0, stop = runners.length; idx < stop; idx++){ for (let idx = 0, stop = runners.length; idx < stop; idx++){
if(runners[idx]){
var runner = Runner.create({ var runner = Runner.create({
"name": runners[idx], "name": runners[idx],
"worker": worker, "worker": worker,
"label": worker.name + ':' + runners[idx] "label": worker.name + ':' + runners[idx]
}); });
worker.availrunners.push(runner); worker.availrunners.push(runner);
}
} }
worker.isBuildingRunners = false; worker.isBuildingRunners = false;
args.callback(worker); args.callback(worker);
@ -211,7 +212,7 @@ var Worker = (function(){
}; };
proto.startRunners = function(args){ proto.__XstartRunners = function(args){
var worker = this; var worker = this;
console.log('Starting runners on', worker.name, worker.ip); console.log('Starting runners on', worker.name, worker.ip);