From 2ec26f2cdc68f9cfb6391e90c1b52083a2f3d213 Mon Sep 17 00:00:00 2001 From: SirStendec Date: Sat, 21 Jul 2018 16:28:46 -0400 Subject: [PATCH] Fix socket server compilation errors. --- socketserver/server/handlecore.go | 1 - socketserver/server/publisher.go | 9 +++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/socketserver/server/handlecore.go b/socketserver/server/handlecore.go index 2420b860..653e2244 100644 --- a/socketserver/server/handlecore.go +++ b/socketserver/server/handlecore.go @@ -13,7 +13,6 @@ import ( "net/url" "os" "os/signal" - "regexp" "runtime" "strconv" "strings" diff --git a/socketserver/server/publisher.go b/socketserver/server/publisher.go index 76f022c2..c44db35c 100644 --- a/socketserver/server/publisher.go +++ b/socketserver/server/publisher.go @@ -4,6 +4,7 @@ import ( "encoding/json" "fmt" "net/http" + "net/url" "strconv" "strings" "sync" @@ -140,14 +141,14 @@ func HTTPBackendDropBacklog(w http.ResponseWriter, r *http.Request) { } } -func rateLimitFromFormData(formData *url.Values) (rate.Limiter, error) { - rateCount := formData.get("rateCount") +func rateLimitFromFormData(formData url.Values) (rate.Limiter, error) { + rateCount := formData.Get("rateCount") if rateCount != "" { c, err := strconv.ParseInt(rateCount, 10, 32) if err != nil { return nil, errors.Wrap(err, "rateCount") } - d, err := time.ParseDuration(formData.get("rateTime")) + d, err := time.ParseDuration(formData.Get("rateTime")) if err != nil { return nil, errors.Wrap(err, "rateTime") } @@ -254,7 +255,7 @@ func HTTPBackendUncachedPublish(w http.ResponseWriter, r *http.Request) { fmt.Fprint(w, "Error: channel must be specified") return } - rl, err := rateLimitFromRequest(r) + rl, err := rateLimitFromFormData(formData) if err != nil { w.WriteHeader(422) fmt.Fprintf(w, "error parsing ratelimit: %v", err)