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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
client/client.go
View File

@ -1,15 +1,15 @@
package client
import (
"git.loafle.net/commons_go/rpc"
"git.loafle.net/commons_go/rpc/client"
crc "git.loafle.net/commons_go/rpc/client"
crcrs "git.loafle.net/commons_go/rpc/client/rwc/socket"
csc "git.loafle.net/commons_go/server/client"
)
func New(addr string, registry rpc.Registry) client.Client {
func New(clientHandler ClientHandler, socketBuilder csc.SocketBuilder) crc.Client {
cRWCHandler := crcrs.New(socketBuilder)
ch := NewClientHandler(addr, registry)
c := client.New(ch)
c := crc.New(clientHandler, cRWCHandler)
return c
}

9
client/client_handlers.go
View File

@ -2,13 +2,12 @@ package client
import (
"git.loafle.net/commons_go/rpc"
"git.loafle.net/commons_go/rpc/client"
crc "git.loafle.net/commons_go/rpc/client"
"git.loafle.net/commons_go/rpc/protocol/json"
)
func NewClientHandler(addr string, registry rpc.Registry) ClientHandler {
func NewClientHandler(registry rpc.Registry) ClientHandler {
ch := &ClientHandlers{}
ch.addr = addr
ch.RPCRegistry = registry
ch.Codec = json.NewClientCodec()
@ -16,7 +15,5 @@ func NewClientHandler(addr string, registry rpc.Registry) ClientHandler {
}
type ClientHandlers struct {
client.ClientHandlers
addr string
crc.ClientHandlers
}

9
client/client_handlers_unix.go
View File

@ -1,9 +0,0 @@
package client
import (
"net"
)
func (ch *ClientHandlers) Connect() (net.Conn, error) {
return net.Dial("unix", ch.addr)
}

11
client/client_handlers_windows.go
View File

@ -1,11 +0,0 @@
package client
import (
"net"
"gopkg.in/natefinch/npipe.v2"
)
func (ch *ClientHandlers) Connect() (net.Conn, error) {
return npipe.Dial(ch.addr)
}

17
client/socket_builders.go Normal file
View File

@ -0,0 +1,17 @@
package client
import (
csc "git.loafle.net/commons_go/server/client"
)
func NewSocketBuilder(address string) csc.SocketBuilder {
return newSocketBuilder(address)
}
type SocketBuilders struct {
csc.SocketBuilders
}
func (sb *SocketBuilders) SocketHandler() csc.SocketHandler {
return NewSocketHandler()
}

13
client/socket_builders_unix.go Normal file
View File

@ -0,0 +1,13 @@
package client
import (
csc "git.loafle.net/commons_go/server/client"
)
func newSocketBuilder(address string) csc.SocketBuilder {
sb := &SocketBuilders{}
sb.Network = "unix"
sb.Address = address
return sb
}

21
client/socket_builders_windows.go Normal file
View File

@ -0,0 +1,21 @@
package client
import (
"net"
csc "git.loafle.net/commons_go/server/client"
"gopkg.in/natefinch/npipe.v2"
)
func newSocketBuilder(address string) csc.SocketBuilder {
sb := &SocketBuilders{}
sb.Network = "pipe"
sb.Address = address
return sb
}
func (sb *SocketBuilders) Dial(dialer *net.Dialer, network, address string) (net.Conn, error) {
return npipe.DialTimeout(`\\.\pipe\`+address, dialer.Timeout)
}

28
client/socket_handlers.go Normal file
View File

@ -0,0 +1,28 @@
package client
import (
"log"
"net"
csc "git.loafle.net/commons_go/server/client"
)
type SocketHandlers struct {
csc.SocketHandlers
}
func (sh *SocketHandlers) OnConnect(socketContext csc.SocketContext, conn net.Conn) {
log.Printf("OnConnect res: %v \n", conn)
}
func (sh *SocketHandlers) OnDisconnect(soc csc.Socket) {
log.Printf("OnDisconnect \n")
}
func (sh *SocketHandlers) Validate() {
sh.SocketHandlers.Validate()
}
func NewSocketHandler() SocketHandler {
return &SocketHandlers{}
}

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)
}