From cd499fa4e53f2f333dd1cce041ed70bd5150c08d Mon Sep 17 00:00:00 2001
From: Henry Oswald <henry.oswald@sharelatex.com>
Date: Mon, 11 Apr 2016 13:47:06 +0100
Subject: [PATCH] server load endpoint uses settings for port

---
 app.coffee                      | 19 +++++++------------
 config/settings.defaults.coffee |  1 +
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/app.coffee b/app.coffee
index b9bf189..0b5c47d 100644
--- a/app.coffee
+++ b/app.coffee
@@ -128,25 +128,20 @@ setInterval () ->
 net = require('net')
 os = require('os')
 
-
-
 server = net.createServer (socket) ->
-	fiveMinLoad = os.loadavg()[0]
+	socket.on "error", (err)->
+		logger.err err:err, "error with socket on load check"
+	currentLoad = os.loadavg()[0]
 	availableWorkingCpus = os.cpus().length - 1
-	freeLoad = availableWorkingCpus - fiveMinLoad
+	freeLoad = availableWorkingCpus - currentLoad
 	freeLoadPercentage = Math.round((freeLoad / availableWorkingCpus) * 100)
 	if freeLoadPercentage < 0
-		freeLoadPercentage = 1 # when its 0 the server is set to drain and will move projects about
+		freeLoadPercentage = 1 # when its 0 the server is set to drain and will move projects to different servers
 	socket.write "up, #{freeLoadPercentage}%\n", "ASCII"
-	socket.on "error", (err)->
-		console.log err, "error with socket"
 	socket.destroy()
-	return
 
-port = 4080
-
-server.listen port,  ->
+server.listen port = (Settings.internal?.clsi?.load_port or 3044),  ->
   console.log "listening on port #{port}"
-  # netcat 127.0.0.1 4080
+  # netcat 127.0.0.1 3044
 
 
diff --git a/config/settings.defaults.coffee b/config/settings.defaults.coffee
index 8e589a5..c7d9e37 100644
--- a/config/settings.defaults.coffee
+++ b/config/settings.defaults.coffee
@@ -32,6 +32,7 @@ module.exports =
 	internal:
 		clsi:
 			port: 3013
+			load_port: 3044
 			host: "localhost"
 
 	apis: