Stefan/evcc-io
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

0.313 backport: chore: fix request cache warning (#32382)

Browse source
This commit is contained in:
Michael Geers 2026-08-01 12:56:12 +02:00 • committed by GitHub
parent 58c4b446d6
commit fff6479115
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 5 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

13
plugin/http.go
View file

@ -229,8 +229,8 @@ func (p *HTTP) request(url string, body string) ([]byte, error) {
// warn on uncached GET polling: a repeated roundtrip means neither a configured
// cache nor the device's own response headers spared it. cache hits are exempt.
if p.method == http.MethodGet && p.mu == nil && resp.Header.Get(httpcache.XFromCache) == "" {
if key := stripQuery(url); repeatedGet(key, time.Now()) {
p.log.WARN.Printf("uncached request repeated within 1s, please report at https://github.com/evcc-io/evcc/issues: %s", key)
if repeatedGet(url, time.Now()) {
p.log.WARN.Printf("uncached request repeated within 1s, please report at https://github.com/evcc-io/evcc/issues: %s", url)
}
}
@ -254,15 +254,6 @@ var (
httpSeen = make(map[string]httpAccess)
)
// stripQuery drops the query and fragment so cache-busting params do not make
// each poll look like a distinct url.
func stripQuery(url string) string {
if i := strings.IndexAny(url, "?#"); i >= 0 {
return url[:i]
}
return url
}
// repeatedGet reports the first time url is fetched again within a second, a sign
// the response should be cached. It fires once per url to avoid log spam.
func repeatedGet(url string, now time.Time) bool {

7
plugin/http_test.go
View file

@ -176,8 +176,7 @@ func TestRepeatedGet(t *testing.T) {
require.False(t, repeatedGet(spaced, t0))
require.False(t, repeatedGet(spaced, t0.Add(2*time.Second))) // >1s apart: no warn
// query params are stripped before keying, so cache-busting still counts as a repeat
require.Equal(t, "http://q.test/path", stripQuery("http://q.test/path?ts=1&x=2#frag"))
require.False(t, repeatedGet(stripQuery("http://q.test/path?ts=1"), t0))
require.True(t, repeatedGet(stripQuery("http://q.test/path?ts=2"), t0.Add(300*time.Millisecond)))
// query params are part of the key, so cache-busting urls are distinct requests
require.False(t, repeatedGet("http://q.test/path?ts=1", t0))
require.False(t, repeatedGet("http://q.test/path?ts=2", t0.Add(300*time.Millisecond)))
}