diff options
Diffstat (limited to 'vendor/github.com/google')
4 files changed, 5 insertions, 37 deletions
diff --git a/vendor/github.com/google/gops/agent/agent.go b/vendor/github.com/google/gops/agent/agent.go index 2af03e5a..de6d90f9 100644 --- a/vendor/github.com/google/gops/agent/agent.go +++ b/vendor/github.com/google/gops/agent/agent.go @@ -120,14 +120,14 @@ func Listen(opts Options) error { return err } - go listen() + go listen(listener) return nil } -func listen() { +func listen(l net.Listener) { buf := make([]byte, 1) for { - fd, err := listener.Accept() + fd, err := l.Accept() if err != nil { // No great way to check for this, see https://golang.org/issues/4373. if !strings.Contains(err.Error(), "use of closed network connection") { diff --git a/vendor/github.com/google/gops/internal/internal.go b/vendor/github.com/google/gops/internal/internal.go index ec63f918..7fc162a6 100644 --- a/vendor/github.com/google/gops/internal/internal.go +++ b/vendor/github.com/google/gops/internal/internal.go @@ -22,8 +22,8 @@ func ConfigDir() (string, error) { return configDir, nil } - if osUserConfigDir := getOSUserConfigDir(); osUserConfigDir != "" { - return filepath.Join(osUserConfigDir, "gops"), nil + if userConfigDir, err := os.UserConfigDir(); err == nil { + return filepath.Join(userConfigDir, "gops"), nil } if runtime.GOOS == "windows" { diff --git a/vendor/github.com/google/gops/internal/internal_go1_13.go b/vendor/github.com/google/gops/internal/internal_go1_13.go deleted file mode 100644 index 252f7969..00000000 --- a/vendor/github.com/google/gops/internal/internal_go1_13.go +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright 2020 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -//go:build go1.13 -// +build go1.13 - -package internal - -import ( - "os" -) - -func getOSUserConfigDir() string { - configDir, err := os.UserConfigDir() - if err != nil { - return "" - } - return configDir -} diff --git a/vendor/github.com/google/gops/internal/internal_lt_go1_13.go b/vendor/github.com/google/gops/internal/internal_lt_go1_13.go deleted file mode 100644 index e1bb00e9..00000000 --- a/vendor/github.com/google/gops/internal/internal_lt_go1_13.go +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright 2020 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -//go:build !go1.13 -// +build !go1.13 - -package internal - -func getOSUserConfigDir() string { - return "" -} |