extern/glance
1
0
Fork 0
mirror of https://github.com/glanceapp/glance.git synced 2025-06-22 02:41:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Truncate response body in error message

Browse Source
This commit is contained in:
Svilen Markov 2024-04-28 14:53:58 +01:00
parent 99fd77feac
commit faeeb7c899
1 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
internal/feed/requests.go
View File

@ -23,6 +23,16 @@ func addBrowserUserAgentHeader(request *http.Request) {
request.Header.Set("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:123.0) Gecko/20100101 Firefox/123.0") request.Header.Set("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:123.0) Gecko/20100101 Firefox/123.0")
} }
func truncateString(s string, maxLen int) string {
asRunes := []rune(s)
if len(asRunes) > maxLen {
return string(asRunes[:maxLen])
}
return s
}
func decodeJsonFromRequest[T any](client RequestDoer, request *http.Request) (T, error) { func decodeJsonFromRequest[T any](client RequestDoer, request *http.Request) (T, error) {
response, err := client.Do(request) response, err := client.Do(request)
var result T var result T
@ -40,7 +50,12 @@ func decodeJsonFromRequest[T any](client RequestDoer, request *http.Request) (T,
} }
if response.StatusCode != http.StatusOK { if response.StatusCode != http.StatusOK {
return result, fmt.Errorf("unexpected status code %d for %s, response: %s", response.StatusCode, request.URL, string(body)) return result, fmt.Errorf(
"unexpected status code %d for %s, response: %s",
response.StatusCode,
request.URL,
truncateString(string(body), 128),
)
} }
err = json.Unmarshal(body, &result) err = json.Unmarshal(body, &result)
@ -76,7 +91,12 @@ func decodeXmlFromRequest[T any](client RequestDoer, request *http.Request) (T,
} }
if response.StatusCode != http.StatusOK { if response.StatusCode != http.StatusOK {
return result, fmt.Errorf("unexpected status code %d for %s, response: %s", response.StatusCode, request.URL, string(body)) return result, fmt.Errorf(
"unexpected status code %d for %s, response: %s",
response.StatusCode,
request.URL,
truncateString(string(body), 128),
)
} }
err = xml.Unmarshal(body, &result) err = xml.Unmarshal(body, &result)