Don't append retention service if not enabled

influxdata · Jun 5, 2015 · 00c262d · 00c262d
1 parent ad24a81
commit 00c262d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/cmd/influxd/run/server.go b/cmd/influxd/run/server.go
@@ -73,6 +73,9 @@ func (s *Server) appendClusterService(c cluster.Config) {
 }
 
 func (s *Server) appendRetentionPolicyService(c retention.Config) {
+	if !c.Enabled {
+		return
+	}
 	srv := retention.NewService(c)
 	srv.MetaStore = s.MetaStore
 	srv.TSDBStore = s.TSDBStore

diff --git a/services/retention/service.go b/services/retention/service.go
@@ -34,7 +34,6 @@ type Service struct {
 // NewService returns a configure retention policy enforcement service.
 func NewService(c Config) *Service {
 	return &Service{
-		enabled:       c.Enabled,
 		checkInterval: time.Duration(c.CheckInterval),
 		done:          make(chan struct{}),
 		logger:        log.New(os.Stderr, "[retention] ", log.LstdFlags),
@@ -43,10 +42,6 @@ func NewService(c Config) *Service {
 
 // Open starts retention policy enforcement.
 func (s *Service) Open() error {
-	if !s.enabled {
-		return nil
-	}
-
 	s.wg.Add(2)
 	go s.deleteShardGroups()
 	go s.deleteShards()