Skip to content
Snippets Groups Projects
Commit 1573e98d authored by AlexStocks's avatar AlexStocks
Browse files

Fix: alexstocks/getty issue 18

parent 38b7dd8d
No related branches found
No related tags found
No related merge requests found
...@@ -24,7 +24,7 @@ import ( ...@@ -24,7 +24,7 @@ import (
import ( import (
"github.com/dubbogo/getty" "github.com/dubbogo/getty"
"github.com/dubbogo/hessian2" hessian "github.com/dubbogo/hessian2"
perrors "github.com/pkg/errors" perrors "github.com/pkg/errors"
) )
import ( import (
...@@ -89,12 +89,11 @@ func (p *RpcClientPackageHandler) Write(ss getty.Session, pkg interface{}) error ...@@ -89,12 +89,11 @@ func (p *RpcClientPackageHandler) Write(ss getty.Session, pkg interface{}) error
// RpcServerPackageHandler // RpcServerPackageHandler
//////////////////////////////////////////// ////////////////////////////////////////////
type RpcServerPackageHandler struct { var (
} rpcServerPkgHandler = &RpcServerPackageHandler{}
)
func NewRpcServerPackageHandler() *RpcServerPackageHandler { type RpcServerPackageHandler struct{}
return &RpcServerPackageHandler{}
}
func (p *RpcServerPackageHandler) Read(ss getty.Session, data []byte) (interface{}, int, error) { func (p *RpcServerPackageHandler) Read(ss getty.Session, data []byte) (interface{}, int, error) {
pkg := &DubboPackage{ pkg := &DubboPackage{
......
...@@ -79,6 +79,8 @@ type Server struct { ...@@ -79,6 +79,8 @@ type Server struct {
conf ServerConfig conf ServerConfig
tcpServer getty.Server tcpServer getty.Server
exporter protocol.Exporter exporter protocol.Exporter
rpcHandler *RpcServerHandler
} }
func NewServer(exporter protocol.Exporter) *Server { func NewServer(exporter protocol.Exporter) *Server {
...@@ -88,6 +90,8 @@ func NewServer(exporter protocol.Exporter) *Server { ...@@ -88,6 +90,8 @@ func NewServer(exporter protocol.Exporter) *Server {
conf: *srvConf, conf: *srvConf,
} }
s.rpcHandler = NewRpcServerHandler(s.exporter, s.conf.SessionNumber, s.conf.sessionTimeout)
return s return s
} }
...@@ -116,8 +120,8 @@ func (s *Server) newSession(session getty.Session) error { ...@@ -116,8 +120,8 @@ func (s *Server) newSession(session getty.Session) error {
session.SetName(conf.GettySessionParam.SessionName) session.SetName(conf.GettySessionParam.SessionName)
session.SetMaxMsgLen(conf.GettySessionParam.MaxMsgLen) session.SetMaxMsgLen(conf.GettySessionParam.MaxMsgLen)
session.SetPkgHandler(NewRpcServerPackageHandler()) session.SetPkgHandler(rpcServerPkgHandler)
session.SetEventListener(NewRpcServerHandler(s.exporter, conf.SessionNumber, conf.sessionTimeout)) session.SetEventListener(s.rpcHandler)
session.SetRQLen(conf.GettySessionParam.PkgRQSize) session.SetRQLen(conf.GettySessionParam.PkgRQSize)
session.SetWQLen(conf.GettySessionParam.PkgWQSize) session.SetWQLen(conf.GettySessionParam.PkgWQSize)
session.SetReadTimeout(conf.GettySessionParam.tcpReadTimeout) session.SetReadTimeout(conf.GettySessionParam.tcpReadTimeout)
......
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