This commit is contained in:
crusader 2017-12-05 14:34:07 +09:00
parent 9c67878002
commit c3cd65f72d
2 changed files with 13 additions and 4 deletions

7
constants.go Normal file
View File

@ -0,0 +1,7 @@
package overflow_probe_container
import cuc "git.loafle.net/commons_go/util/context"
var (
RPCServletKey = cuc.ContextKey("RPCServlet")
)

View File

@ -5,10 +5,11 @@ import (
"sync" "sync"
cRPC "git.loafle.net/commons_go/rpc" 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/rpc/protocol/json"
crsrs "git.loafle.net/commons_go/rpc/server/rwc/socket"
"git.loafle.net/commons_go/server" "git.loafle.net/commons_go/server"
oopc "git.loafle.net/overflow/overflow_probe_container"
) )
func newSocketHandler(rpcSH RPCServletHandler) SocketHandler { func newSocketHandler(rpcSH RPCServletHandler) SocketHandler {
@ -45,12 +46,12 @@ func (sh *SocketHandlers) OnConnect(soc server.Socket) {
sh.SocketHandlers.OnConnect(soc) sh.SocketHandlers.OnConnect(soc)
soc.Context().SetAttribute(cRPC.ContentTypeKey, json.Name) soc.Context().SetAttribute(cRPC.ContentTypeKey, json.Name)
soc.Context().SetAttribute(oopc.RPCServletKey, retainRPCServlet(sh.rpcSH, sh.rpcRWCSH))
} }
func (sh *SocketHandlers) Handle(soc server.Socket, stopChan <-chan struct{}, doneChan chan<- error) { func (sh *SocketHandlers) Handle(soc server.Socket, stopChan <-chan struct{}, doneChan chan<- error) {
var err error var err error
rpcServlet := retainRPCServlet(sh.rpcSH, sh.rpcRWCSH) rpcServlet := soc.Context().GetAttribute(oopc.RPCServletKey).(cRPC.Servlet)
defer func() { defer func() {
releaseRPCServlet(rpcServlet) releaseRPCServlet(rpcServlet)
@ -72,6 +73,7 @@ func (sh *SocketHandlers) Handle(soc server.Socket, stopChan <-chan struct{}, do
} }
func (sh *SocketHandlers) OnDisconnect(soc server.Socket) { func (sh *SocketHandlers) OnDisconnect(soc server.Socket) {
soc.Context().RemoveAttribute(oopc.RPCServletKey)
sh.SocketHandlers.OnDisconnect(soc) sh.SocketHandlers.OnDisconnect(soc)
} }