summaryrefslogtreecommitdiff
path: root/internal/gtserror/util.go
diff options
context:
space:
mode:
authorLibravatar kim <89579420+NyaaaWhatsUpDoc@users.noreply.github.com>2023-05-21 17:59:14 +0100
committerLibravatar GitHub <noreply@github.com>2023-05-21 18:59:14 +0200
commit2063d01cdb02c7ef26dc6d917e3bca252db5d5a8 (patch)
treeae220bc4956beb8bc09e3786f4ba8a0fb99b521b /internal/gtserror/util.go
parent[feature] Make client IP logging configurable (#1799) (diff)
downloadgotosocial-2063d01cdb02c7ef26dc6d917e3bca252db5d5a8.tar.xz
[bugfix] Add back removed ValidateRequest() before backoff-retry loop (#1805)v0.9.0-rc2
* add back removed ValidateRequest() before backoff-retry loop Signed-off-by: kim <grufwub@gmail.com> * include response body in error response log Signed-off-by: kim <grufwub@gmail.com> * improved error response body draining Signed-off-by: kim <grufwub@gmail.com> * add more code commenting Signed-off-by: kim <grufwub@gmail.com> * move new error response logic to gtserror, handle instead in transport.Transport{} impl Signed-off-by: kim <grufwub@gmail.com> * appease ye oh mighty linter Signed-off-by: kim <grufwub@gmail.com> * fix mockhttpclient not setting request in http response Signed-off-by: kim <grufwub@gmail.com> --------- Signed-off-by: kim <grufwub@gmail.com>
Diffstat (limited to 'internal/gtserror/util.go')
-rw-r--r--internal/gtserror/util.go42
1 files changed, 42 insertions, 0 deletions
diff --git a/internal/gtserror/util.go b/internal/gtserror/util.go
new file mode 100644
index 000000000..635518b76
--- /dev/null
+++ b/internal/gtserror/util.go
@@ -0,0 +1,42 @@
+// 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 <http://www.gnu.org/licenses/>.
+
+package gtserror
+
+import (
+ "io"
+
+ "codeberg.org/gruf/go-byteutil"
+)
+
+// drainBody will produce a truncated output of the content
+// of given io.ReadCloser body, useful for logs / errors.
+func drainBody(body io.ReadCloser, trunc int) string {
+ // Limit response to 'trunc' bytes.
+ buf := make([]byte, trunc)
+
+ // Read body into err buffer.
+ n, _ := io.ReadFull(body, buf)
+
+ if n == 0 {
+ // No error body, return
+ // reasonable error str.
+ return "<empty>"
+ }
+
+ return byteutil.B2S(buf[:n])
+}