Skip to content
Snippets Groups Projects
Commit 590226bd authored by AlexStocks's avatar AlexStocks
Browse files

fix protocol linter error

parent 43aa8179
No related branches found
No related tags found
No related merge requests found
......@@ -30,6 +30,10 @@ import (
perrors "github.com/pkg/errors"
)
import (
"github.com/apache/dubbo-go/common/logger"
)
/////////////////////////////////////////
// dubbo
/////////////////////////////////////////
......@@ -221,10 +225,18 @@ func packRequest(service Service, header DubboHeader, req interface{}) ([]byte,
}
// dubbo version + path + version + method
encoder.Encode(DEFAULT_DUBBO_PROTOCOL_VERSION)
encoder.Encode(service.Path)
encoder.Encode(service.Version)
encoder.Encode(service.Method)
if err := encoder.Encode(DEFAULT_DUBBO_PROTOCOL_VERSION); err != nil {
logger.Error("Encode(DEFAULT_DUBBO_PROTOCOL_VERSION) = error: %v", err)
}
if err := encoder.Encode(service.Path); err != nil {
logger.Error("Encode(service.Path) = error: %v", err)
}
if err := encoder.Encode(service.Version); err != nil {
logger.Error("Encode(service.Version) = error: %v", err)
}
if err := encoder.Encode(service.Method); err != nil {
logger.Error("Encode(service.Method) = error: %v", err)
}
// args = args type list + args value list
if types, err = getArgsTypeList(args); err != nil {
......
......@@ -181,15 +181,17 @@ func (c *HTTPClient) Do(addr, path string, httpHeader http.Header, body []byte)
return nil, perrors.WithStack(err)
}
defer tcpConn.Close()
setNetConnTimeout := func(conn net.Conn, timeout time.Duration) {
setNetConnTimeout := func(conn net.Conn, timeout time.Duration) error {
t := time.Time{}
if timeout > time.Duration(0) {
t = time.Now().Add(timeout)
}
conn.SetDeadline(t)
return conn.SetDeadline(t)
}
if err := setNetConnTimeout(tcpConn, c.options.HTTPTimeout); err != nil {
return nil, err
}
setNetConnTimeout(tcpConn, c.options.HTTPTimeout)
if _, err = reqBuf.WriteTo(tcpConn); err != nil {
return nil, perrors.WithStack(err)
......
......@@ -92,7 +92,9 @@ func (s *Server) handlePkg(conn net.Conn) {
t = time.Now().Add(timeout)
}
conn.SetDeadline(t)
if err := conn.SetDeadline(t); err != nil {
logger.Error("connection.SetDeadline(t:%v) = error:%v", t, err)
}
}
sendErrorResp := func(header http.Header, body []byte) error {
......@@ -239,7 +241,9 @@ func (s *Server) Start(url *common.URL) {
s.wg.Add(1)
go func() {
accept(listener, func(conn net.Conn) { s.handlePkg(conn) })
if err := accept(listener, func(conn net.Conn) { s.handlePkg(conn) }); err != nil {
logger.Error("accept() = error:%v", err)
}
s.wg.Done()
}()
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment