From 00c262d1f69bef963c1fb26eb33f563c98d04d47 Mon Sep 17 00:00:00 2001
From: Philip O'Toole <philip.otoole@yahoo.com>
Date: Thu, 4 Jun 2015 21:44:00 -0700
Subject: [PATCH] Don't append retention service if not enabled

---
 cmd/influxd/run/server.go     | 3 +++
 services/retention/service.go | 5 -----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/cmd/influxd/run/server.go b/cmd/influxd/run/server.go
index 0063e5be0db..7d97f401de5 100644
--- 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
index 103fdfb847c..6a386d62ef5 100644
--- 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()