- bugfix: ignored `stopping` value during http server shutdown

- debug log now split message into individual lines

1 files changed, 9 insertions, 18 deletions

diff --git a/service/http/service.go b/service/http/service.go
index a7e8e44c..e8e8eb51 100644
--- a/service/http/service.go
+++ b/service/http/service.go
@@ -12,7 +12,6 @@ import (
 	"net/url"
 	"strings"
 	"sync"
-	"sync/atomic"
 )
 
 const (
@@ -28,16 +27,15 @@ type middleware func(f http.HandlerFunc) http.HandlerFunc
 
 // Service manages rr, http servers.
 type Service struct {
-	cfg      *Config
-	env      env.Environment
-	lsns     []func(event int, ctx interface{})
-	mdwr     []middleware
-	mu       sync.Mutex
-	rr       *roadrunner.Server
-	stopping int32
-	handler  *Handler
-	http     *http.Server
-	https    *http.Server
+	cfg     *Config
+	env     env.Environment
+	lsns    []func(event int, ctx interface{})
+	mdwr    []middleware
+	mu      sync.Mutex
+	rr      *roadrunner.Server
+	handler *Handler
+	http    *http.Server
+	https   *http.Server
 }
 
 // AddMiddleware adds new net/http mdwr.
@@ -109,13 +107,6 @@ func (s *Service) Serve() error {
 
 // Stop stops the svc.
 func (s *Service) Stop() {
-	if atomic.LoadInt32(&s.stopping) != 0 {
-		// already stopping
-		return
-	}
-
-	atomic.StoreInt32(&s.stopping, 1)
-
 	s.mu.Lock()
 	defer s.mu.Unlock()
 	if s.http == nil {