balki/anyhttp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change address syntax to be a URL #3

Merged
balki merged 7 commits from addr-url into main 2024-12-19 10:06:03 -05:00
Conversation 0 Commits 7 Files Changed 3 +8 -32
1 changed files with 8 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 06e51af628 - Show all commits

40
anyhttp.go
View File

@ -280,26 +280,18 @@ func parseAddress(addr string) (addrType AddressType, usc *UnixSocketConfig, sys
usc = &duc usc = &duc
addrType = UnixSocket addrType = UnixSocket
for key, val := range u.Query() { for key, val := range u.Query() {
if len(val) != 1 {
err = fmt.Errorf("unix socket address error. Multiple %v found: %v", key, val)
return
}
if key == "path" { if key == "path" {
if len(val) != 1 {
err = fmt.Errorf("unix socket address error. Multiple path found: %v", val)
return
}
usc.SocketPath = val[0] usc.SocketPath = val[0]
} else if key == "mode" { } else if key == "mode" {
if len(val) != 1 {
err = fmt.Errorf("unix socket address error. Multiple mode found: %v", val)
return
}
if _, serr := fmt.Sscanf(val[0], "%o", &usc.SocketMode); serr != nil { if _, serr := fmt.Sscanf(val[0], "%o", &usc.SocketMode); serr != nil {
err = fmt.Errorf("unix socket address error. Bad mode: %v, err: %w", val, serr) err = fmt.Errorf("unix socket address error. Bad mode: %v, err: %w", val, serr)
return return
} }
} else if key == "remove_existing" { } else if key == "remove_existing" {
if len(val) != 1 {
err = fmt.Errorf("unix socket address error. Multiple remove_existing found: %v", val)
return
}
if removeExisting, berr := strconv.ParseBool(val[0]); berr == nil { if removeExisting, berr := strconv.ParseBool(val[0]); berr == nil {
usc.RemoveExisting = removeExisting usc.RemoveExisting = removeExisting
} else { } else {
@ -320,17 +312,13 @@ func parseAddress(addr string) (addrType AddressType, usc *UnixSocketConfig, sys
sysc = &dsc sysc = &dsc
addrType = SystemdFD addrType = SystemdFD
for key, val := range u.Query() { for key, val := range u.Query() {
if len(val) != 1 {
err = fmt.Errorf("systemd socket fd address error. Multiple %v found: %v", key, val)
return
}
if key == "name" { if key == "name" {
if len(val) != 1 {
err = fmt.Errorf("systemd socket fd address error. Multiple name found: %v", val)
return
}
sysc.FDName = &val[0] sysc.FDName = &val[0]
} else if key == "idx" { } else if key == "idx" {
if len(val) != 1 {
err = fmt.Errorf("systemd socket fd address error. Multiple idx found: %v", val)
return
}
if idx, ierr := strconv.Atoi(val[0]); ierr == nil { if idx, ierr := strconv.Atoi(val[0]); ierr == nil {
sysc.FDIndex = &idx sysc.FDIndex = &idx
} else { } else {
@ -338,10 +326,6 @@ func parseAddress(addr string) (addrType AddressType, usc *UnixSocketConfig, sys
return return
} }
} else if key == "check_pid" { } else if key == "check_pid" {
if len(val) != 1 {
err = fmt.Errorf("systemd socket fd address error. Multiple check_pid found: %v", val)
return
}
if checkPID, berr := strconv.ParseBool(val[0]); berr == nil { if checkPID, berr := strconv.ParseBool(val[0]); berr == nil {
sysc.CheckPID = checkPID sysc.CheckPID = checkPID
} else { } else {
@ -349,10 +333,6 @@ func parseAddress(addr string) (addrType AddressType, usc *UnixSocketConfig, sys
return return
} }
} else if key == "unset_env" { } else if key == "unset_env" {
if len(val) != 1 {
err = fmt.Errorf("systemd socket fd address error. Multiple unset_env found: %v", val)
return
}
if unsetEnv, berr := strconv.ParseBool(val[0]); berr == nil { if unsetEnv, berr := strconv.ParseBool(val[0]); berr == nil {
sysc.UnsetEnv = unsetEnv sysc.UnsetEnv = unsetEnv
} else { } else {
@ -360,10 +340,6 @@ func parseAddress(addr string) (addrType AddressType, usc *UnixSocketConfig, sys
return return
} }
} else if key == "idle_timeout" { } else if key == "idle_timeout" {
if len(val) != 1 {
err = fmt.Errorf("systemd socket fd address error. Multiple idle_timeout found: %v", val)
return
}
if timeout, terr := time.ParseDuration(val[0]); terr == nil { if timeout, terr := time.ParseDuration(val[0]); terr == nil {
sysc.IdleTimeout = &timeout sysc.IdleTimeout = &timeout
} else { } else {