fix panic on close

influxdata · Mar 8, 2017 · 0375e6d · 0375e6d
1 parent bb576c2
commit 0375e6d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/services/alert/api.go b/services/alert/api.go
@@ -113,7 +113,9 @@ func (s *apiServer) Open() error {
 }
 
 func (s *apiServer) Close() error {
-	s.HTTPDService.DelRoutes(s.routes)
+	if s.HTTPDService != nil {
+		s.HTTPDService.DelRoutes(s.routes)
+	}
 	return nil
 }
 

diff --git a/services/alert/service.go b/services/alert/service.go
@@ -155,6 +155,13 @@ func (s *Service) Open() error {
 	return nil
 }
 
+func (s *Service) Close() error {
+	s.mu.Lock()
+	defer s.mu.Unlock()
+	s.topics.Close()
+	return s.APIServer.Close()
+}
+
 func (s *Service) loadSavedHandlerSpecs() error {
 	offset := 0
 	limit := 100
@@ -235,13 +242,6 @@ func (s *Service) loadSavedTopicStates() error {
 	return nil
 }
 
-func (s *Service) Close() error {
-	s.mu.Lock()
-	defer s.mu.Unlock()
-	s.topics.Close()
-	return s.APIServer.Close()
-}
-
 func validatePattern(pattern string) error {
 	_, err := path.Match(pattern, "")
 	return err