bingyi/gf
1
0
Fork 0
mirror of https://gitee.com/johng/gf synced 2026-06-06 02:25:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: SetListener overwrite default address

Browse Source
This commit is contained in:
Macrow
2022-03-22 21:35:53 +08:00
parent 73ca527b0a
commit 325887fa18
2 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
net/ghttp/ghttp_server_config.go
View File

@ -420,11 +420,10 @@ func (s *Server) SetHTTPSPort(port ...int) {
// SetListener set the custom listener for the server.
// It will overwrite the address you specified before.
func (s *Server) SetListener(l net.Listener) error {
addrArray := gstr.SplitAndTrim(l.Addr().String(), ":")
port, err := strconv.Atoi(addrArray[len(addrArray)-1])
if err != nil {
return err
if l == nil {
return gerror.NewCodef(gcode.CodeInvalidParameter, "listener is nil")
}
port := (l.Addr().(*net.TCPAddr)).Port
s.config.Address = fmt.Sprintf(":%d", port)
s.config.Listeners = map[int]net.Listener{port: l}
return nil
@ -435,16 +434,12 @@ func (s *Server) SetListener(l net.Listener) error {
// If the listener's port not match the port provided in map, the method will return error.
func (s *Server) SetListeners(listeners map[int]net.Listener) error {
for k, v := range listeners {
addrArray := gstr.SplitAndTrim(v.Addr().String(), ":")
port, err := strconv.Atoi(addrArray[len(addrArray)-1])
if err != nil {
return err
}
if port != k {
portIndeed := (v.Addr().(*net.TCPAddr)).Port
if portIndeed != k {
return gerror.NewCodef(
gcode.CodeInvalidParameter,
"listener specified by port %d should listen at port %d, but got port: %d",
k, k, port,
"listener specified by port %d listen at port %d indeed",
k, portIndeed,
)
}
}

4
net/ghttp/ghttp_z_unit_feature_custom_listeners_test.go
View File

@ -76,8 +76,8 @@ func Test_SetWrongCustomListeners(t *testing.T) {
s.SetAddr(":8199")
ln, err := net.Listen("tcp", ":8299")
t.AssertNil(err)
s.SetListeners(map[int]net.Listener{8199: ln})
err = s.SetListeners(map[int]net.Listener{8199: ln})
t.AssertNQ(err, nil)
s.Start()
defer s.Shutdown()