From 0da257197fd0afe509c51939ae7335f5a28c9676 Mon Sep 17 00:00:00 2001 From: Kane York Date: Sat, 22 Jul 2017 15:31:12 -0700 Subject: [PATCH 1/2] Remove relative imports, update main for ratelimiting --- socketserver/cmd/ffzsocketserver/console.go | 9 +++++---- socketserver/cmd/ffzsocketserver/socketserver.go | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/socketserver/cmd/ffzsocketserver/console.go b/socketserver/cmd/ffzsocketserver/console.go index 93c95987..d22ba178 100644 --- a/socketserver/cmd/ffzsocketserver/console.go +++ b/socketserver/cmd/ffzsocketserver/console.go @@ -6,7 +6,8 @@ import ( "strconv" "strings" - "../../server" + "github.com/FrankerFaceZ/FrankerFaceZ/socketserver/server" + "github.com/FrankerFaceZ/FrankerFaceZ/socketserver/server/rate" "github.com/abiosoft/ishell" "github.com/gorilla/websocket" ) @@ -33,7 +34,7 @@ func commandLineConsole() { Command: "message", Arguments: args[0], } - server.PublishToAll(msg) + server.PublishToAll(msg, rate.Unlimited()) return "Message sent.", nil }) @@ -52,9 +53,9 @@ func commandLineConsole() { var count int if target == "_ALL" { - count = server.PublishToAll(msg) + count = server.PublishToAll(msg, rate.Unlimited()) } else { - count = server.PublishToChannel(target, msg) + count = server.PublishToChannel(target, msg, rate.Unlimited()) } return fmt.Sprintf("Published to %d clients", count), nil }) diff --git a/socketserver/cmd/ffzsocketserver/socketserver.go b/socketserver/cmd/ffzsocketserver/socketserver.go index 1d67bddc..312d38c5 100644 --- a/socketserver/cmd/ffzsocketserver/socketserver.go +++ b/socketserver/cmd/ffzsocketserver/socketserver.go @@ -1,4 +1,4 @@ -package main // import "bitbucket.org/stendec/frankerfacez/socketserver/cmd/ffzsocketserver" +package main // import "github.com/FrankerFaceZ/FrankerFaceZ/socketserver/cmd/ffzsocketserver" import ( "encoding/json" @@ -9,7 +9,7 @@ import ( "net/http" "os" - "../../server" + "github.com/FrankerFaceZ/FrankerFaceZ/socketserver/server" ) import _ "net/http/pprof" From e04b6c84f8530dd5dcffc7e0901801ea911185c1 Mon Sep 17 00:00:00 2001 From: Kane York Date: Thu, 24 Aug 2017 11:54:56 -0700 Subject: [PATCH 2/2] Treat any 200 code as success --- socketserver/server/backend.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/socketserver/server/backend.go b/socketserver/server/backend.go index 3b7a8c3c..5bae575d 100644 --- a/socketserver/server/backend.go +++ b/socketserver/server/backend.go @@ -139,7 +139,7 @@ func (backend *backendInfo) SendRemoteCommand(remoteCommand, data string, auth A if resp.StatusCode == 401 { return "", ErrAuthorizationNeeded - } else if resp.StatusCode != 200 { + } else if resp.StatusCode < 200 || resp.StatusCode > 299 { // any non-2xx if resp.Header.Get("Content-Type") == "application/json" { var err2 ErrForwardedFromBackend err := json.Unmarshal(respBytes, &err2.JSONError)