fishy commented on code in PR #3379:
URL: https://github.com/apache/thrift/pull/3379#discussion_r3061267560
##########
lib/go/thrift/server_socket.go:
##########
@@ -44,28 +47,75 @@ func NewTServerSocketTimeout(listenAddr string,
clientTimeout time.Duration) (*T
if err != nil {
return nil, err
}
- return &TServerSocket{addr: addr, clientTimeout: clientTimeout}, nil
+
+ return NewTServerSocketFromAddrTimeout(addr, clientTimeout), nil
}
-// Creates a TServerSocket from a net.Addr
func NewTServerSocketFromAddrTimeout(addr net.Addr, clientTimeout
time.Duration) *TServerSocket {
- return &TServerSocket{addr: addr, clientTimeout: clientTimeout}
+ factory := func(listen bool) (net.Addr, net.Listener, error) {
+ var listener net.Listener
+ var err error
+ if (listen){
+ listener, err = net.Listen(addr.Network(),
addr.String())
+ }
+ return addr, listener, err
+ }
+
+ return NewTServerSocketFromFactoryTimeout(factory, clientTimeout)
}
-func (p *TServerSocket) Listen() error {
+// Allows full customization (TLS, mocks, unix sockets, windows named pipes,
etc.)
Review Comment:
go's doc comment require the comment starts with `//
NewTServerSocketFromFactoryTimeout ...`
##########
lib/go/thrift/server_socket.go:
##########
@@ -89,49 +122,41 @@ func (p *TServerSocket) Accept() (TTransport, error) {
// Checks whether the socket is listening.
func (p *TServerSocket) IsListening() bool {
+ p.mu.RLock()
+ defer p.mu.RUnlock()
return p.listener != nil
}
-// Connects the socket, creating a new socket object if necessary.
-func (p *TServerSocket) Open() error {
- p.mu.Lock()
- defer p.mu.Unlock()
- if p.IsListening() {
- return NewTTransportException(ALREADY_OPEN, "Server socket
already open")
- }
- if l, err := net.Listen(p.addr.Network(), p.addr.String()); err != nil {
- return err
- } else {
- p.listener = l
- }
- return nil
-}
-
func (p *TServerSocket) Addr() net.Addr {
p.mu.RLock()
defer p.mu.RUnlock()
- if p.IsListening() {
+
+ if p.listener != nil {
return p.listener.Addr()
}
- return p.addr
+ addr, _, _ := p.factory(false)
Review Comment:
this line no longer compiles?
##########
lib/go/thrift/server_socket.go:
##########
@@ -44,28 +47,58 @@ func NewTServerSocketTimeout(listenAddr string,
clientTimeout time.Duration) (*T
if err != nil {
return nil, err
}
- return &TServerSocket{addr: addr, clientTimeout: clientTimeout}, nil
+
+ return NewTServerSocketFromAddrTimeout(addr, clientTimeout), nil
}
// Creates a TServerSocket from a net.Addr
func NewTServerSocketFromAddrTimeout(addr net.Addr, clientTimeout
time.Duration) *TServerSocket {
- return &TServerSocket{addr: addr, clientTimeout: clientTimeout}
+ factory := func(addr net.Addr) (net.Listener, error) {
+ return net.Listen(addr.Network(), addr.String())
+ }
+
+ return NewTServerSocketFromFactoryTimeout(factory, addr, clientTimeout)
}
-func (p *TServerSocket) Listen() error {
+// Allows full customization (TLS, mocks, unix sockets, windows named pipes,
etc.)
+func NewTServerSocketFromFactoryTimeout(factory func(addr net.Addr) (listener
net.Listener, err error), addr net.Addr, clientTimeout time.Duration)
*TServerSocket {
+ return &TServerSocket{
+ factory: factory,
+ addr: addr,
+ clientTimeout: clientTimeout,
+ }
+}
+
+func (p *TServerSocket) try_listen(raise bool) error {
p.mu.Lock()
defer p.mu.Unlock()
- if p.IsListening() {
+
+ if p.listener != nil {
+ if (raise) {
+ return NewTTransportException(ALREADY_OPEN, "Server
socket already open")
+ }
return nil
}
- l, err := net.Listen(p.addr.Network(), p.addr.String())
+
+ _, l, err := p.factory(true)
Review Comment:
this line also doesn't compile any more.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
