better shutdown

4 files changed, 7 insertions, 3 deletions

diff --git a/cmd/rr/cmd/serve.go b/cmd/rr/cmd/serve.go
index 4ae2a9d9..dc751611 100644
--- a/cmd/rr/cmd/serve.go
+++ b/cmd/rr/cmd/serve.go
@@ -40,7 +40,10 @@ func init() {
 }
 
 func serveHandler(cmd *cobra.Command, args []string) error {
-	go Container.Serve()
+	go func() {
+		Container.Serve()
+		stopSignal <- nil
+	}()
 	<-stopSignal
 	Container.Stop()
 
diff --git a/server.go b/server.go
index f8b0d64b..29b51225 100644
--- a/server.go
+++ b/server.go
@@ -64,6 +64,7 @@ func (s *Server) Start() (err error) {
 	defer s.mu.Unlock()
 
 	if s.factory, err = s.cfg.makeFactory(); err != nil {
+
 		return err
 	}
 
diff --git a/service/http/service.go b/service/http/service.go
index 2df8656c..7fad3c49 100644
--- a/service/http/service.go
+++ b/service/http/service.go
@@ -105,7 +105,6 @@ func (s *Service) Stop() {
 
 	atomic.AddInt32(&s.inStopping, 1)
 	defer atomic.AddInt32(&s.inStopping, -1)
-
 	s.http.Shutdown(context.Background())
 }
 
diff --git a/service/rpc/service.go b/service/rpc/service.go
index e1147754..c301e6bb 100644
--- a/service/rpc/service.go
+++ b/service/rpc/service.go
@@ -60,10 +60,11 @@ func (s *Service) Serve() error {
 		for {
 			select {
 			case <-s.stop:
-				break
+				return
 			default:
 				conn, err := ln.Accept()
 				if err != nil {
+
 					continue
 				}