github/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2024-11-21 20:46:30 -05:00
Code Issues Projects Releases Packages Wiki Activity

resources: Add timeout to the HTTP request in Get

Browse source 
Workaround for https://github.com/golang/go/issues/49366
This commit is contained in:
Bjørn Erik Pedersen 2021-12-02 14:13:24 +01:00
parent 94f149b21e
commit 93572e5318
4 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -1,6 +1,7 @@
/hugo
docs/public*
/.idea
.vscode/*
hugo.exe
*.test
*.prof

2
cache/filecache/filecache_test.go vendored
View file

@ -276,7 +276,7 @@ func TestFileCacheReadOrCreateErrorInRead(t *testing.T) {
}
}
cache := NewCache(afero.NewMemMapFs(), 100*time.Hour, "")
cache := NewCache(afero.NewMemMapFs(), 100*time.Hour, 0, "")
const id = "a32"

9
resources/resource_factories/create/create.go
View file

@ -18,6 +18,7 @@ package create
import (
"bufio"
"bytes"
"context"
"fmt"
"io"
"io/ioutil"
@ -180,6 +181,14 @@ func (c *Client) FromRemote(uri string, options map[string]interface{}) (resourc
}
addUserProvidedHeaders(headers, req)
}
// Workaround for https://github.com/golang/go/issues/49366
// This is the entire lifetime of the request.
ctx, cancel := context.WithTimeout(req.Context(), 30*time.Second)
defer cancel()
req = req.WithContext(ctx)
res, err := c.httpClient.Do(req)
if err != nil {
return nil, err

3
tpl/data/resources_test.go
View file

@ -34,7 +34,6 @@ import (
"github.com/gohugoio/hugo/hugofs"
"github.com/gohugoio/hugo/langs"
"github.com/spf13/afero"
)
func TestScpGetLocal(t *testing.T) {
@ -87,7 +86,7 @@ func TestScpGetRemote(t *testing.T) {
t.Parallel()
c := qt.New(t)
fs := new(afero.MemMapFs)
cache := filecache.NewCache(fs, 100, "")
cache := filecache.NewCache(fs, 100, 0, "")
tests := []struct {
path string