go/go-micro
1
0
Fork 0
mirror of https://github.com/go-micro/go-micro.git synced 2025-06-18 22:17:44 +02:00
Code Issues Releases Activity

Add Router interface

Browse Source
This commit is contained in:
Asim Aslam
2019-01-08 20:32:47 +00:00
parent 4cb41721f1
commit f46828be33
4 changed files with 29 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
server/rpc_server.go
View File

@ -45,7 +45,8 @@ func newRpcServer(opts ...Option) Server {
}
}
func (s *rpcServer) accept(sock transport.Socket) {
// ServeConn serves a single connection
func (s *rpcServer) ServeConn(sock transport.Socket) {
defer func() {
// close socket
sock.Close()
@ -92,6 +93,7 @@ func (s *rpcServer) accept(sock transport.Socket) {
// no content type
if len(ct) == 0 {
msg.Header["Content-Type"] = DefaultContentType
ct = DefaultContentType
}
@ -111,8 +113,16 @@ func (s *rpcServer) accept(sock transport.Socket) {
// create the internal server codec
codec := newRpcCodec(&msg, sock, cf)
// set router
var r Router
r = s.router
if s.opts.Router != nil {
r = s.opts.Router
}
// TODO: needs better error handling
if err := s.router.ServeRequest(ctx, codec, ct); err != nil {
if err := r.ServeRequest(ctx, codec); err != nil {
s.wg.Done()
log.Logf("Unexpected error serving request, closing socket: %v", err)
return
@ -402,7 +412,7 @@ func (s *rpcServer) Start() error {
go func() {
for {
err := ts.Accept(s.accept)
err := ts.Accept(s.ServeConn)
// check if we're supposed to exit
select {