From 14a628a8ff837aa6c1b5244be20d6018f03dce0c Mon Sep 17 00:00:00 2001
From: William Mantly <wmantly@gmail.com>
Date: Mon, 9 Oct 2017 00:26:58 -0400
Subject: [PATCH] simpler

---
 routes/api.js | 19 +++++++++++++++----
 testAPI.js    | 14 ++++++++------
 2 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/routes/api.js b/routes/api.js
index 95a26a6..6d4ac12 100644
--- a/routes/api.js
+++ b/routes/api.js
@@ -215,9 +215,10 @@ var workers = (function(){
 		workers.checkForZombies();
 
 		// if there are workers being created, stop scale up and down check
-		if(workers.currentCreating) return ;
+		if(workers.currentCreating+workers.length < workers.min) 'do nothing';
+		else if(workers.currentCreating)
+			return ;
 
-		// scale up and down check
 
 		// hold amount of workers with no used runners
 		var lastMinAval = 0;
@@ -234,13 +235,23 @@ var workers = (function(){
 
 		if(lastMinAval > workers.settings.minAvail){
 			// Remove workers if there are more then the settings states
-			console.log('Last 3 runners not used, killing last runner', workers.length);
+			console.log(
+				'Last 3 runners not used, killing last runner', 
+				'lastMinAval:', lastMinAval,
+				'minAvail:', workers.settings.minAvail,
+				'workers:', workers.length
+			);
 
 			return workers.destroy();
 
 		} else if(lastMinAval < workers.settings.minAvail){
 			// creates workers if the settings file demands it
-			console.log('last 3 workers have no free runners, starting droplet');
+			console.log(
+				'last 3 workers have no free runners, starting droplet',
+				'lastMinAval:', lastMinAval,
+				'minAvail:', workers.settings.minAvail,
+				'workers:', workers.length
+			);
 
 			return workers.create();
 		}
diff --git a/testAPI.js b/testAPI.js
index 1c7beec..501fd5f 100644
--- a/testAPI.js
+++ b/testAPI.js
@@ -1,16 +1,18 @@
 const request = require('request');
 
-var till = 15;
+var till = 5;
 var completed = 0;
 var errors = 0;
 
 for(let i=0; i<till; i++){
 	console.log('calling', i);
 	let httpOptions = {
-		url: 'http://codeland.bytedev.co:2000/api/run',
+		url: 'http://codeland.bytedev.co:2000/api/run?once=true',
 		form: {
-			code: `python3 -c "print(1)"`,
-			once: true,
+			code: `python3 -c "
+from time import sleep
+sleep(10)
+			"`,
 		}
 	};
 	request.post(httpOptions, function(error, response, body){
@@ -20,8 +22,8 @@ for(let i=0; i<till; i++){
 		}
 
 		body = JSON.parse(body);
-
-		console.log(i, body);
+		let res = (Buffer.from(body.res, 'base64').toString('ascii'));
+		console.log(i, res);
 		if(completed===till){
 			console.log(errors);
 		}