overflow_backup_2018_0455/overflow_discovery
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ing

Browse Source
This commit is contained in:
crusader
2017-11-30 19:16:55 +09:00
parent ec15abc42d
commit 95adf7ec26
10 changed files with 100 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
server/rpc_servlet_handlers.go
View File

@@ -2,8 +2,6 @@ package server
import (
"git.loafle.net/commons_go/rpc"
crcs "git.loafle.net/commons_go/rpc/connection/socket"
"git.loafle.net/commons_go/rpc/protocol"
"git.loafle.net/commons_go/rpc/server"
)
@@ -16,19 +14,6 @@ func newRPCServletHandler(rpcRegistry rpc.Registry) server.ServletHandler {
type RPCServletHandlers struct {
server.ServletHandlers
rpcIO crcs.ServletHandlers
}
func (sh *RPCServletHandlers) ReadRequest(servletCTX rpc.ServletContext, codec protocol.ServerCodec, conn interface{}) (protocol.ServerRequestCodec, error) {
return sh.rpcIO.ReadRequest(servletCTX, codec, conn)
}
func (sh *RPCServletHandlers) WriteResponse(servletCTX rpc.ServletContext, conn interface{}, requestCodec protocol.ServerRequestCodec, result interface{}, err error) error {
return sh.rpcIO.WriteResponse(servletCTX, conn, requestCodec, result, err)
}
func (sh *RPCServletHandlers) WriteNotification(servletCTX rpc.ServletContext, conn interface{}, codec protocol.ServerCodec, method string, args []interface{}) error {
return sh.rpcIO.WriteNotification(servletCTX, conn, codec, method, args)
}
func (sh *RPCServletHandlers) Validate() {

18
server/socket_handlers.go
View File

@@ -5,14 +5,19 @@ import (
"sync"
cRPC "git.loafle.net/commons_go/rpc"
crsrs "git.loafle.net/commons_go/rpc/server/rwc/socket"
"git.loafle.net/commons_go/rpc/protocol/json"
"git.loafle.net/commons_go/server"
"git.loafle.net/overflow/overflow_discovery/discovery"
)
func newSocketHandler(rpcSH RPCServletHandler) SocketHandler {
rpcRWCSH := crsrs.New()
sh := &SocketHandlers{
rpcSH: rpcSH,
rpcSH: rpcSH,
rpcRWCSH: rpcRWCSH,
}
return sh
@@ -21,7 +26,8 @@ func newSocketHandler(rpcSH RPCServletHandler) SocketHandler {
type SocketHandlers struct {
server.SocketHandlers
rpcSH RPCServletHandler
rpcRWCSH cRPC.ServletReadWriteCloseHandler
rpcSH RPCServletHandler
}
func (sh *SocketHandlers) Init(serverCTX server.ServerContext) error {
@@ -45,7 +51,7 @@ func (sh *SocketHandlers) OnConnect(soc server.Socket) {
func (sh *SocketHandlers) Handle(soc server.Socket, stopChan <-chan struct{}, doneChan chan<- error) {
var err error
rpcServlet := retainRPCServlet(sh.rpcSH)
rpcServlet := retainRPCServlet(sh.rpcSH, sh.rpcRWCSH)
discovery.RPCServlet = rpcServlet
defer func() {
@@ -63,8 +69,8 @@ func (sh *SocketHandlers) Handle(soc server.Socket, stopChan <-chan struct{}, do
case err = <-rpcDoneChan:
case <-stopChan:
rpcServlet.Stop()
<-rpcDoneChan
}
}
func (sh *SocketHandlers) OnDisconnect(soc server.Socket) {
@@ -83,10 +89,10 @@ func (sh *SocketHandlers) Validate() {
var rpcServletPool sync.Pool
func retainRPCServlet(sh RPCServletHandler) cRPC.Servlet {
func retainRPCServlet(sh RPCServletHandler, rpcRWCSH cRPC.ServletReadWriteCloseHandler) cRPC.Servlet {
v := rpcServletPool.Get()
if v == nil {
return cRPC.NewServlet(sh)
return cRPC.NewServlet(sh, rpcRWCSH)
}
return v.(cRPC.Servlet)
}