commons_go/rpc
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ing

Browse Source
This commit is contained in:
crusader 2017-11-28 18:51:08 +09:00
parent 96b71dc5d5
commit d852233f81
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
servlet.go
View File

@ -18,7 +18,7 @@ func NewServlet(sh ServletHandler) Servlet {
} }
type Servlet interface { type Servlet interface {
Start(parentCTX cuc.Context, conn interface{}) error Start(parentCTX cuc.Context, conn interface{}, doneChan chan<- error) error
Stop() Stop()
Send(method string, args ...interface{}) (err error) Send(method string, args ...interface{}) (err error)
@ -31,6 +31,7 @@ type servlet struct {
sh ServletHandler sh ServletHandler
messageQueueChan chan *messageState messageQueueChan chan *messageState
doneChan chan<- error
conn interface{} conn interface{}
serverCodec protocol.ServerCodec serverCodec protocol.ServerCodec
@ -38,7 +39,7 @@ type servlet struct {
stopWg sync.WaitGroup stopWg sync.WaitGroup
} }
func (s *servlet) Start(parentCTX cuc.Context, conn interface{}) error { func (s *servlet) Start(parentCTX cuc.Context, conn interface{}, doneChan chan<- error) error {
if nil == s.sh { if nil == s.sh {
panic("Servlet: servlet handler must be specified.") panic("Servlet: servlet handler must be specified.")
} }
@ -54,6 +55,7 @@ func (s *servlet) Start(parentCTX cuc.Context, conn interface{}) error {
return err return err
} }
s.doneChan = doneChan
s.conn = conn s.conn = conn
s.serverCodec = sc s.serverCodec = sc
@ -102,7 +104,12 @@ func (s *servlet) Context() ServletContext {
} }
func handleServlet(s *servlet) { func handleServlet(s *servlet) {
defer s.stopWg.Done() var err error
defer func() {
s.doneChan <- err
s.stopWg.Done()
}()
subStopChan := make(chan struct{}) subStopChan := make(chan struct{})
@ -112,8 +119,6 @@ func handleServlet(s *servlet) {
writerDone := make(chan error, 1) writerDone := make(chan error, 1)
go handleWriter(s, subStopChan, writerDone) go handleWriter(s, subStopChan, writerDone)
var err error
select { select {
case err = <-readerDone: case err = <-readerDone:
close(subStopChan) close(subStopChan)