Skip to content

Work in Progress - Ongoing impl of the ability to choose which FD is used #4

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

Open
flozano wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Work in Progress - Ongoing impl of the ability to choose which FD is used #4

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
521a9af
Ongoing impl of select'able file descriptor
flozano Jul 6, 2015
99b51ef
Replace listener with new listener from dup'ed FD
flozano Jul 6, 2015
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
41 changes: 37 additions & 4 deletions starter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,9 +188,11 @@ func setEnv() {
}
}

func parsePortSpec(addr string) (string, int, error) {
func parsePortSpec(addr string) (string, int, int, error) {
i := strings.IndexByte(addr, ':')
portPart := ""
fdPart := ""

if i < 0 {
portPart = addr
addr = ""
Expand All @@ -199,12 +201,26 @@ func parsePortSpec(addr string) (string, int, error) {
addr = addr[:i]
}

j := strings.IndexByte(portPart, '=')
if j > 0 {
fdPart = portPart[j+1:]
portPart = portPart[:j]
}

port, err := strconv.ParseInt(portPart, 10, 64)
if err != nil {
return "", -1, err
return "", -1, -1, err
}

return addr, int(port), nil
if fdPart == "" {
return addr, int(port), -1, nil
} else {
fd, err := strconv.ParseInt(fdPart, 10, 64)
if err != nil {
return addr, int(port), -1, err
}
return addr, int(port), int(fd), nil
}
}

func (s *Starter) Run() error {
Expand All @@ -223,7 +239,7 @@ func (s *Starter) Run() error {
for _, addr := range s.ports {
var l net.Listener

host, port, err := parsePortSpec(addr)
host, port, fd, err := parsePortSpec(addr)
if err != nil {
fmt.Fprintf(os.Stderr, "failed to parse addr spec '%s': %s", addr, err)
return err
Expand All @@ -235,6 +251,23 @@ func (s *Starter) Run() error {
fmt.Fprintf(os.Stderr, "failed to listen to %s:%s\n", hostport, err)
return err
}
if fd != -1 {
file, err := l.(*net.TCPListener).File()
if err == nil {
oldFD := file.Fd()
err = syscall.Dup2 (int(oldFD), fd)
if err == nil {
l, err = net.FileListener(os.NewFile(uintptr(fd), ""))
if err == nil {
err = syscall.Close(int(oldFD))
}
}
}
if err != nil {
fmt.Fprintf(os.Stderr, "failed to duplicate fd: %s", err)
return err
}
}

spec := ""
if host == "" {
Expand Down