From 9b0597ca8245373e53cca891024559c1574552e1 Mon Sep 17 00:00:00 2001
From: Kane York <rikingcoding@gmail.com>
Date: Tue, 17 Nov 2015 11:11:14 -0800
Subject: [PATCH] Those numbers are in kilobytes.

---
 socketserver/server/backend.go    |  8 ++++----
 socketserver/server/handlecore.go |  8 ++++----
 socketserver/server/stats.go      | 14 +++++++-------
 socketserver/server/types.go      |  2 +-
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/socketserver/server/backend.go b/socketserver/server/backend.go
index e43d6448..8c96fd51 100644
--- a/socketserver/server/backend.go
+++ b/socketserver/server/backend.go
@@ -307,10 +307,10 @@ func httpError(statusCode int) error {
 func GenerateKeys(outputFile, serverID, theirPublicStr string) {
 	var err error
 	output := ConfigFile{
-		ListenAddr:     "0.0.0.0:8001",
-		SocketOrigin:   "localhost:8001",
-		BackendURL:     "http://localhost:8002/ffz",
-		MinMemoryBytes: defaultMinMemory,
+		ListenAddr:      "0.0.0.0:8001",
+		SocketOrigin:    "localhost:8001",
+		BackendURL:      "http://localhost:8002/ffz",
+		MinMemoryKBytes: defaultMinMemoryKB,
 	}
 
 	output.ServerID, err = strconv.Atoi(serverID)
diff --git a/socketserver/server/handlecore.go b/socketserver/server/handlecore.go
index fe9a4a2a..dad4de2b 100644
--- a/socketserver/server/handlecore.go
+++ b/socketserver/server/handlecore.go
@@ -35,7 +35,7 @@ const AuthorizeCommand Command = "do_authorize"
 // on a goroutine over the ClientInfo.MessageChannel and should not be delivered immediately.
 const AsyncResponseCommand Command = "_async"
 
-const defaultMinMemory = 1024 * 1024 * 24
+const defaultMinMemoryKB = 1024 * 24
 
 // TwitchDotTv is the http origin for twitch.tv.
 const TwitchDotTv = "http://www.twitch.tv"
@@ -52,8 +52,8 @@ var Configuration *ConfigFile
 func SetupServerAndHandle(config *ConfigFile, serveMux *http.ServeMux) {
 	Configuration = config
 
-	if config.MinMemoryBytes == 0 {
-		config.MinMemoryBytes = defaultMinMemory
+	if config.MinMemoryKBytes == 0 {
+		config.MinMemoryKBytes = defaultMinMemoryKB
 	}
 
 	setupBackend(config)
@@ -116,7 +116,7 @@ func HTTPHandleRootURL(w http.ResponseWriter, r *http.Request) {
 	if r.Header.Get("Connection") == "Upgrade" {
 		updateSysMem()
 
-		if Statistics.SysMemTotal-Statistics.SysMemFree < Configuration.MinMemoryBytes {
+		if Statistics.SysMemTotalKB-Statistics.SysMemFreeKB < Configuration.MinMemoryKBytes {
 			w.WriteHeader(503)
 			return
 		}
diff --git a/socketserver/server/stats.go b/socketserver/server/stats.go
index fe692a00..9fe89978 100644
--- a/socketserver/server/stats.go
+++ b/socketserver/server/stats.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"net/http"
 	"runtime"
+	"sync"
 	"time"
 
 	linuxproc "github.com/c9s/goprocinfo/linux"
-	"sync"
 )
 
 type StatsData struct {
@@ -25,10 +25,10 @@ type StatsData struct {
 
 	PubSubChannelCount int
 
-	SysMemTotal uint64
-	SysMemFree  uint64
-	MemoryInUse uint64
-	MemoryRSS   uint64
+	SysMemTotalKB uint64
+	SysMemFreeKB  uint64
+	MemoryInUse   uint64
+	MemoryRSS     uint64
 
 	MemoryPerClient uint64
 
@@ -145,8 +145,8 @@ func updateSysMem() {
 	sysMemLastUpdate = time.Now()
 	memInfo, err := linuxproc.ReadMemInfo("/proc/meminfo")
 	if err == nil {
-		Statistics.SysMemTotal = memInfo.MemTotal
-		Statistics.SysMemFree = memInfo.MemAvailable
+		Statistics.SysMemTotalKB = memInfo.MemTotal
+		Statistics.SysMemFreeKB = memInfo.MemAvailable
 	}
 }
 
diff --git a/socketserver/server/types.go b/socketserver/server/types.go
index e851961b..a3358028 100644
--- a/socketserver/server/types.go
+++ b/socketserver/server/types.go
@@ -21,7 +21,7 @@ type ConfigFile struct {
 	BackendURL string
 
 	// Minimum memory to accept a new connection
-	MinMemoryBytes uint64
+	MinMemoryKBytes uint64
 
 	// SSL/TLS
 	UseSSL             bool