From 6a29c5ffd40f1919cac40030c53160c19812bc8d Mon Sep 17 00:00:00 2001 From: kim <89579420+NyaaaWhatsUpDoc@users.noreply.github.com> Date: Fri, 28 Apr 2023 16:45:21 +0100 Subject: [performance] improved request batching (removes need for queueing) (#1687) * revamp http client to not limit requests, instead use sender worker Signed-off-by: kim * remove separate sender worker pool, spawn 2*GOMAXPROCS batch senders each time, no need for transport cache sweeping Signed-off-by: kim * improve batch senders to keep popping recipients until remote URL found Signed-off-by: kim * fix recipient looping issue Signed-off-by: kim * fix missing mutex unlock Signed-off-by: kim * move request id ctx key to gtscontext, finish filling out more code comments, add basic support for not logging client IP Signed-off-by: kim * slight code reformatting Signed-off-by: kim * a whitespace Signed-off-by: kim * remove unused code Signed-off-by: kim * add missing license headers Signed-off-by: kim * fix request backoff calculation Signed-off-by: kim --------- Signed-off-by: kim --- internal/httpclient/request.go | 62 ------------------------------------------ 1 file changed, 62 deletions(-) delete mode 100644 internal/httpclient/request.go (limited to 'internal/httpclient/request.go') diff --git a/internal/httpclient/request.go b/internal/httpclient/request.go deleted file mode 100644 index 881d3f699..000000000 --- a/internal/httpclient/request.go +++ /dev/null @@ -1,62 +0,0 @@ -// GoToSocial -// Copyright (C) GoToSocial Authors admin@gotosocial.org -// SPDX-License-Identifier: AGPL-3.0-or-later -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public License for more details. -// -// You should have received a copy of the GNU Affero General Public License -// along with this program. If not, see . - -package httpclient - -import ( - "fmt" - "net/http" - "strings" - - "golang.org/x/net/http/httpguts" -) - -// ValidateRequest performs the same request validation logic found in the default -// net/http.Transport{}.roundTrip() function, but pulls it out into this separate -// function allowing validation errors to be wrapped under a single error type. -func ValidateRequest(r *http.Request) error { - switch { - case r.URL == nil: - return fmt.Errorf("%w: nil url", ErrInvalidRequest) - case r.Header == nil: - return fmt.Errorf("%w: nil header", ErrInvalidRequest) - case r.URL.Host == "": - return fmt.Errorf("%w: empty url host", ErrInvalidRequest) - case r.URL.Scheme != "http" && r.URL.Scheme != "https": - return fmt.Errorf("%w: unsupported protocol %q", ErrInvalidRequest, r.URL.Scheme) - case strings.IndexFunc(r.Method, func(r rune) bool { return !httpguts.IsTokenRune(r) }) != -1: - return fmt.Errorf("%w: invalid method %q", ErrInvalidRequest, r.Method) - } - - for key, values := range r.Header { - // Check field key name is valid - if !httpguts.ValidHeaderFieldName(key) { - return fmt.Errorf("%w: invalid header field name %q", ErrInvalidRequest, key) - } - - // Check each field value is valid - for i := 0; i < len(values); i++ { - if !httpguts.ValidHeaderFieldValue(values[i]) { - return fmt.Errorf("%w: invalid header field value %q", ErrInvalidRequest, values[i]) - } - } - } - - // ps. kim wrote this - - return nil -} -- cgit v1.2.3