From 096fe787b72c129544fe744134caeb0175033274 Mon Sep 17 00:00:00 2001 From: Kane York Date: Tue, 17 Nov 2015 11:04:10 -0800 Subject: [PATCH] Set min memory to 24mb if blank --- socketserver/server/backend.go | 2 +- socketserver/server/handlecore.go | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/socketserver/server/backend.go b/socketserver/server/backend.go index e456c9df..e43d6448 100644 --- a/socketserver/server/backend.go +++ b/socketserver/server/backend.go @@ -310,7 +310,7 @@ func GenerateKeys(outputFile, serverID, theirPublicStr string) { ListenAddr: "0.0.0.0:8001", SocketOrigin: "localhost:8001", BackendURL: "http://localhost:8002/ffz", - MinMemoryBytes: 1024 * 1024 * 24, + MinMemoryBytes: defaultMinMemory, } output.ServerID, err = strconv.Atoi(serverID) diff --git a/socketserver/server/handlecore.go b/socketserver/server/handlecore.go index 5cb9584a..fe9a4a2a 100644 --- a/socketserver/server/handlecore.go +++ b/socketserver/server/handlecore.go @@ -35,6 +35,11 @@ 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 + +// TwitchDotTv is the http origin for twitch.tv. +const TwitchDotTv = "http://www.twitch.tv" + // ResponseSuccess is a Reply ClientMessage with the MessageID not yet filled out. var ResponseSuccess = ClientMessage{Command: SuccessCommand} @@ -47,6 +52,10 @@ var Configuration *ConfigFile func SetupServerAndHandle(config *ConfigFile, serveMux *http.ServeMux) { Configuration = config + if config.MinMemoryBytes == 0 { + config.MinMemoryBytes = defaultMinMemory + } + setupBackend(config) if serveMux == nil { @@ -88,8 +97,6 @@ func SetupServerAndHandle(config *ConfigFile, serveMux *http.ServeMux) { go ircConnection() } -const TwitchDotTv = "http://www.twitch.tv" - // SocketUpgrader is the websocket.Upgrader currently in use. var SocketUpgrader = websocket.Upgrader{ ReadBufferSize: 1024,