Mirrors/juanfont.headscale
1
0
Fork 0
mirror of https://github.com/juanfont/headscale.git synced 2024-12-20 19:09:07 +01:00
Code Issues Projects Releases Wiki Activity

Add and fix noctx linter

Browse Source
This commit is contained in:
Kristoffer Dalby 2021-11-14 16:37:43 +01:00
parent 1969802c6b
commit d0ef850035
No known key found for this signature in database
GPG Key ID: 09F62DC067465735
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.golangci.yaml
View File

@ -30,7 +30,6 @@ linters:
- stylecheck
- wrapcheck
- paralleltest
- noctx
- nlreturn
- ifshort
- gomnd

12
derp.go
View File

@ -1,6 +1,7 @@
package headscale
import (
"context"
"encoding/json"
"io"
"io/ioutil"
@ -30,10 +31,19 @@ func loadDERPMapFromPath(path string) (*tailcfg.DERPMap, error) {
}
func loadDERPMapFromURL(addr url.URL) (*tailcfg.DERPMap, error) {
ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
defer cancel()
req, err := http.NewRequestWithContext(ctx, "GET", addr.String(), nil)
if err != nil {
return nil, err
}
client := http.Client{
Timeout: 10 * time.Second,
}
resp, err := client.Get(addr.String())
resp, err := client.Do(req)
if err != nil {
return nil, err
}