registry.Register: use local variable to get context value

registry/consul_registry.go

@@ -14,10 +14,6 @@ import (
 	hash "github.com/mitchellh/hashstructure"
 )
 
-const (
-	ConsulRegisterTCPCheckKey = "consul_register_tcp_check"
-)
-
 type consulRegistry struct {
 	Address string
 	Client  *consul.Client
@@ -137,17 +133,18 @@ func (c *consulRegistry) Register(s *Service, opts ...RegisterOption) error {
 		return errors.New("Require at least one node")
 	}
 
+	var regTCPCheck bool
+	var regInterval time.Duration
+
 	var options RegisterOptions
 	for _, o := range opts {
 		o(&options)
 	}
 
 	if c.opts.Context != nil {
-		tcpCheckInterval, ok := c.opts.Context.
+		if tcpCheckInterval, ok := c.opts.Context.Value("consul_register_tcp_check").(time.Duration); ok {
-			Value(ConsulRegisterTCPCheckKey).(time.Duration)
+			regTCPCheck = true
-		if ok {
+			regInterval = tcpCheckInterval
-			options.TCPCheck = true
-			options.Interval = tcpCheckInterval
 		}
 	}
 
@@ -181,12 +178,12 @@ func (c *consulRegistry) Register(s *Service, opts ...RegisterOption) error {
 
 	var check *consul.AgentServiceCheck
 
-	if options.TCPCheck {
+	if regTCPCheck {
-		deregTTL := getDeregisterTTL(options.Interval)
+		deregTTL := getDeregisterTTL(regInterval)
 
 		check = &consul.AgentServiceCheck{
 			TCP:                            fmt.Sprintf("%s:%d", node.Address, node.Port),
-			Interval:                       fmt.Sprintf("%v", options.Interval),
+			Interval:                       fmt.Sprintf("%v", regInterval),
 			DeregisterCriticalServiceAfter: fmt.Sprintf("%v", deregTTL),
 		}
 

registry/options.go

@@ -18,9 +18,7 @@ type Options struct {
 }
 
 type RegisterOptions struct {
-	TCPCheck bool
+	TTL time.Duration
-	TTL      time.Duration
-	Interval time.Duration
 	// Other options for implementations of the interface
 	// can be stored in a context
 	Context context.Context