Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: look for the File() method instead of assuming TCP or Unix Listeners #318

Closed
wants to merge 3 commits into from
Closed

feat: look for the File() method instead of assuming TCP or Unix Listeners #318

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6a2feeb
look for the File() method instead of assuming TCP or Unix Listeners.…
jvilhuber Mar 4, 2024
e0ed868
do a little bit more error and nil checking
jvilhuber Mar 11, 2024
ac92622
Merge branch 'develop' into feature/jvilhuber-generalize-parseFD
jvilhuber Mar 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 8 additions & 10 deletions net_listener.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,18 +144,16 @@ func (ln *listener) Fd() (fd int) {
return ln.fd
}

type filer interface {
File() (*os.File, error)
}

func (ln *listener) parseFD() (err error) {
switch netln := ln.ln.(type) {
case *net.TCPListener:
ln.file, err = netln.File()
case *net.UnixListener:
ln.file, err = netln.File()
default:
return errors.New("listener type can't support")
}
if err != nil {
return err
netln, ok := ln.ln.(filer)
if !ok {
return errors.New("listener type not supported (no File() method)")
}
ln.file, err = netln.File()
jvilhuber marked this conversation as resolved.
Show resolved Hide resolved
ln.fd = int(ln.file.Fd())
return nil
}
Loading