refactor!: avoid to use caddy duration as pointer. (#26)

Author: vuongxuongminh

caddyfile.go

@@ -113,8 +113,7 @@ reverse_proxy {
 					return err
 				}
 
-				duration := caddy.Duration(dt)
-				h.FetchSchemaInterval = &duration
+				h.FetchSchemaInterval = caddy.Duration(dt)
 			case "fetch_schema_timeout":
 				if !d.NextArg() {
 					return d.ArgErr()
@@ -127,8 +126,7 @@ reverse_proxy {
 					return err
 				}
 
-				duration := caddy.Duration(dt)
-				h.FetchSchemaTimeout = &duration
+				h.FetchSchemaTimeout = caddy.Duration(dt)
 			case "fetch_schema_header":
 				if !d.NextArg() {
 					return d.ArgErr()

handler.go

@@ -35,10 +35,10 @@ type Handler struct {
 	Upstream string `json:"upstream,omitempty"`
 
 	// Fetch schema interval, disabled by default.
-	FetchSchemaInterval *caddy.Duration `json:"fetch_schema_interval,omitempty"`
+	FetchSchemaInterval caddy.Duration `json:"fetch_schema_interval,omitempty"`
 
 	// Fetch schema request timeout, "30s" by default
-	FetchSchemaTimeout *caddy.Duration `json:"fetch_schema_timeout,omitempty"`
+	FetchSchemaTimeout caddy.Duration `json:"fetch_schema_timeout,omitempty"`
 
 	// Fetch schema headers
 	FetchSchemaHeader http.Header `json:"fetch_schema_headers,omitempty"`
@@ -120,16 +120,15 @@ func (h *Handler) Provision(ctx caddy.Context) (err error) {
 		h.Caching.withMetrics(h)
 	}
 
-	if h.FetchSchemaTimeout == nil {
+	if h.FetchSchemaTimeout == 0 {
 		timeout, _ := caddy.ParseDuration("30s")
-		fetchTimeout := caddy.Duration(timeout)
-		h.FetchSchemaTimeout = &fetchTimeout
+		h.FetchSchemaTimeout = caddy.Duration(timeout)
 	}
 
 	sf := &schemaFetcher{
 		upstream:        h.Upstream,
 		header:          h.FetchSchemaHeader,
-		timeout:         *h.FetchSchemaTimeout,
+		timeout:         h.FetchSchemaTimeout,
 		interval:        h.FetchSchemaInterval,
 		logger:          h.logger,
 		context:         h.ctxBackground,

schema_fetcher.go

@@ -29,7 +29,7 @@ type schemaFetcher struct {
 	// Upstream url
 	upstream string
 	header   http.Header
-	interval *caddy.Duration
+	interval caddy.Duration
 	timeout  caddy.Duration
 
 	caching         *Caching
@@ -53,7 +53,9 @@ func (s *schemaFetcher) Provision(ctx caddy.Context) (err error) {
 		return err
 	}
 
-	if s.interval == nil {
+	if s.interval == 0 {
+		s.logger.Info("fetch schema interval disabled")
+
 		return nil
 	}
 
@@ -63,7 +65,7 @@ func (s *schemaFetcher) Provision(ctx caddy.Context) (err error) {
 }
 
 func (s *schemaFetcher) startInterval() {
-	interval := time.NewTicker(time.Duration(*s.interval))
+	interval := time.NewTicker(time.Duration(s.interval))
 
 	defer interval.Stop()
 

schema_fetcher_test.go

@@ -21,7 +21,6 @@ type SchemaFetcherTestSuite struct {
 }
 
 func (s *SchemaFetcherTestSuite) TestInterval() {
-	i := caddy.Duration(time.Millisecond)
 	ctx, cancel := context.WithCancel(context.Background())
 	sh := schemaChangedHandler(func(oldDocument, newDocument *ast.Document, oldSchema, newSchema *graphql.Schema) {
 		s.Require().NotNil(newDocument)
@@ -30,7 +29,7 @@ func (s *SchemaFetcherTestSuite) TestInterval() {
 	})
 	f := &schemaFetcher{
 		upstream:        "http://localhost:9091",
-		interval:        &i,
+		interval:        caddy.Duration(time.Millisecond),
 		onSchemaChanged: sh,
 		context:         ctx,
 		header:          make(http.Header),