From 32a338437e23afb1c75d9bedd48bdb252e7a167e Mon Sep 17 00:00:00 2001 From: Thomas Harvey Date: Mon, 16 Oct 2017 19:27:18 -0400 Subject: [PATCH] updated logic and names --- allocate_runners.sh | 2 +- routes/worker_collection.js | 21 +++++++++++---------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/allocate_runners.sh b/allocate_runners.sh index 7ab5543..6fe513f 100644 --- a/allocate_runners.sh +++ b/allocate_runners.sh @@ -18,7 +18,7 @@ until [[ $memory -gt $maxMemoryUsage ]]; do lxc-start-ephemeral -o $baseName -n $runnerName --union-type overlayfs -d; if [[ $? -eq 0 ]]; then - runners="${runnerName};${runners}"; + runners="${runners};${runnerName}"; fi usedMemoryPercent; done diff --git a/routes/worker_collection.js b/routes/worker_collection.js index ad1f61d..3bb62d4 100644 --- a/routes/worker_collection.js +++ b/routes/worker_collection.js @@ -143,7 +143,7 @@ var Worker = (function(){ }); }; - proto.initialize = function(callback, config){ + proto.initialize = function(hooks, config){ // Create droplet // Once active the droplet begins to create runners doapi.dropletToActive({ @@ -158,7 +158,7 @@ var Worker = (function(){ }, onActive: function(data, args){ var worker = Worker.create(data); - worker.newStartRunners(callback); + worker.newStartRunners(hooks); } }); }; @@ -195,13 +195,14 @@ var Worker = (function(){ console.log(arguments); var runners = data.split(";"); for (let idx = 0, stop = runners.length; idx < stop; idx++){ - - var runner = Runner.create({ - "name": runners[idx], - "worker": worker, - "label": worker.name + ':' + runners[idx] - }); - worker.availrunners.push(runner); + if(runners[idx]){ + var runner = Runner.create({ + "name": runners[idx], + "worker": worker, + "label": worker.name + ':' + runners[idx] + }); + worker.availrunners.push(runner); + } } worker.isBuildingRunners = false; args.callback(worker); @@ -211,7 +212,7 @@ var Worker = (function(){ }; - proto.startRunners = function(args){ + proto.__XstartRunners = function(args){ var worker = this; console.log('Starting runners on', worker.name, worker.ip);