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-30 16:15:20 +09:00
parent 3e3a884c4d
commit 526dce9cce
1 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
servlet.go
View File

@ -81,21 +81,7 @@ func (s *rpcServlet) Start(parentCTX cuc.Context, conn interface{}, doneChan cha
} }
func (s *rpcServlet) Stop() { func (s *rpcServlet) Stop() {
if s.stopChan == nil { s.destroy(nil)
panic("Server: server must be started before stopping it")
}
close(s.stopChan)
s.stopWg.Wait()
s.sh.Destroy(s.ctx)
s.stopChan = nil
s.responseQueueChan = nil
s.conn = nil
s.serverCodec = nil
logging.Logger().Info(fmt.Sprintf("Servlet is stopped"))
} }
func (s *rpcServlet) Send(method string, args ...interface{}) (err error) { func (s *rpcServlet) Send(method string, args ...interface{}) (err error) {
@ -116,6 +102,26 @@ func (s *rpcServlet) Context() ServletContext {
return s.ctx return s.ctx
} }
func (s *rpcServlet) destroy(err error) {
if s.stopChan == nil {
panic("Server: server must be started before stopping it")
}
close(s.stopChan)
s.stopWg.Wait()
s.sh.Destroy(s.ctx)
s.stopChan = nil
s.responseQueueChan = nil
s.conn = nil
s.serverCodec = nil
logging.Logger().Info(fmt.Sprintf("Servlet is stopped"))
s.doneChan <- err
}
func handleServlet(s *rpcServlet) { func handleServlet(s *rpcServlet) {
var err error var err error
@ -123,8 +129,7 @@ func handleServlet(s *rpcServlet) {
defer func() { defer func() {
s.stopWg.Done() s.stopWg.Done()
s.Stop() s.destroy(err)
s.doneChan <- err
}() }()
subStopChan := make(chan struct{}) subStopChan := make(chan struct{})