transport: clean endpoint listen (#989)

* fix endpoint listen
pull/990/head
Tony Chen 4 years ago committed by GitHub
parent 02f9ea49c7
commit 42b60381c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 40
      transport/grpc/server.go
  2. 40
      transport/http/server.go

@ -4,7 +4,7 @@ import (
"context" "context"
"net" "net"
"net/url" "net/url"
"strings" "sync"
"time" "time"
"github.com/go-kratos/kratos/v2/api/metadata" "github.com/go-kratos/kratos/v2/api/metadata"
@ -73,6 +73,8 @@ type Server struct {
*grpc.Server *grpc.Server
ctx context.Context ctx context.Context
lis net.Listener lis net.Listener
once sync.Once
err error
network string network string
address string address string
endpoint *url.URL endpoint *url.URL
@ -120,35 +122,33 @@ func NewServer(opts ...ServerOption) *Server {
// examples: // examples:
// grpc://127.0.0.1:9000?isSecure=false // grpc://127.0.0.1:9000?isSecure=false
func (s *Server) Endpoint() (*url.URL, error) { func (s *Server) Endpoint() (*url.URL, error) {
if s.lis == nil && strings.HasSuffix(s.address, ":0") { s.once.Do(func() {
lis, err := net.Listen(s.network, s.address) lis, err := net.Listen(s.network, s.address)
if err != nil { if err != nil {
return nil, err s.err = err
return
}
addr, err := host.Extract(s.address, s.lis)
if err != nil {
lis.Close()
s.err = err
return
} }
s.lis = lis s.lis = lis
s.endpoint = &url.URL{Scheme: "grpc", Host: addr}
})
if s.err != nil {
return nil, s.err
} }
addr, err := host.Extract(s.address, s.lis) return s.endpoint, nil
if err != nil {
return nil, err
}
u := &url.URL{
Scheme: "grpc",
Host: addr,
}
s.endpoint = u
return u, nil
} }
// Start start the gRPC server. // Start start the gRPC server.
func (s *Server) Start(ctx context.Context) error { func (s *Server) Start(ctx context.Context) error {
s.ctx = ctx if _, err := s.Endpoint(); err != nil {
if s.lis == nil { return err
lis, err := net.Listen(s.network, s.address)
if err != nil {
return err
}
s.lis = lis
} }
s.ctx = ctx
s.log.Infof("[gRPC] server listening on: %s", s.lis.Addr().String()) s.log.Infof("[gRPC] server listening on: %s", s.lis.Addr().String())
s.health.Resume() s.health.Resume()
return s.Serve(s.lis) return s.Serve(s.lis)

@ -6,7 +6,7 @@ import (
"net" "net"
"net/http" "net/http"
"net/url" "net/url"
"strings" "sync"
"time" "time"
ic "github.com/go-kratos/kratos/v2/internal/context" ic "github.com/go-kratos/kratos/v2/internal/context"
@ -56,6 +56,8 @@ type Server struct {
*http.Server *http.Server
ctx context.Context ctx context.Context
lis net.Listener lis net.Listener
once sync.Once
err error
network string network string
address string address string
endpoint *url.URL endpoint *url.URL
@ -112,35 +114,33 @@ func (s *Server) ServeHTTP(res http.ResponseWriter, req *http.Request) {
// examples: // examples:
// http://127.0.0.1:8000?isSecure=false // http://127.0.0.1:8000?isSecure=false
func (s *Server) Endpoint() (*url.URL, error) { func (s *Server) Endpoint() (*url.URL, error) {
if s.lis == nil && strings.HasSuffix(s.address, ":0") { s.once.Do(func() {
lis, err := net.Listen(s.network, s.address) lis, err := net.Listen(s.network, s.address)
if err != nil { if err != nil {
return nil, err s.err = err
return
}
addr, err := host.Extract(s.address, s.lis)
if err != nil {
lis.Close()
s.err = err
return
} }
s.lis = lis s.lis = lis
s.endpoint = &url.URL{Scheme: "http", Host: addr}
})
if s.err != nil {
return nil, s.err
} }
addr, err := host.Extract(s.address, s.lis) return s.endpoint, nil
if err != nil {
return nil, err
}
u := &url.URL{
Scheme: "http",
Host: addr,
}
s.endpoint = u
return u, nil
} }
// Start start the HTTP server. // Start start the HTTP server.
func (s *Server) Start(ctx context.Context) error { func (s *Server) Start(ctx context.Context) error {
s.ctx = ctx if _, err := s.Endpoint(); err != nil {
if s.lis == nil { return err
lis, err := net.Listen(s.network, s.address)
if err != nil {
return err
}
s.lis = lis
} }
s.ctx = ctx
s.log.Infof("[HTTP] server listening on: %s", s.lis.Addr().String()) s.log.Infof("[HTTP] server listening on: %s", s.lis.Addr().String())
if err := s.Serve(s.lis); !errors.Is(err, http.ErrServerClosed) { if err := s.Serve(s.lis); !errors.Is(err, http.ErrServerClosed) {
return err return err

Loading…
Cancel
Save