jodis: don't start jodis until proxy is registered

spinlock · spinlock · commit 1b517de2ab63 · 2017-03-08T14:04:14.000+08:00
diff --git a/pkg/proxy/jodis.go b/pkg/proxy/jodis.go
@@ -22,6 +22,7 @@ type Jodis struct {
 	data []byte
 
 	client models.Client
+	online bool
 	closed bool
 
 	watching bool
@@ -98,6 +99,13 @@ func (j *Jodis) Rewatch() (<-chan struct{}, error) {
 }
 
 func (j *Jodis) Start() {
+	j.mu.Lock()
+	defer j.mu.Unlock()
+	if j.online {
+		return
+	}
+	j.online = true
+
 	go func() {
 		var delay = &DelayExp2{
 			Min: 1, Max: 30,
diff --git a/pkg/proxy/proxy.go b/pkg/proxy/proxy.go
@@ -45,13 +45,13 @@ type Proxy struct {
 
 	lproxy net.Listener
 	ladmin net.Listener
-	xjodis *Jodis
 
 	ha struct {
 		monitor *redis.Sentinel
 		masters map[int]string
 		servers []string
 	}
+	jodis *Jodis
 }
 
 var ErrClosedProxy = errors.New("use of closed proxy")
@@ -151,7 +151,7 @@ func (s *Proxy) setup(config *Config) error {
 		} else {
 			s.model.JodisPath = models.JodisPath(config.ProductName, s.model.Token)
 		}
-		s.xjodis = NewJodis(c, s.model)
+		s.jodis = NewJodis(c, s.model)
 	}
 
 	return nil
@@ -168,6 +168,9 @@ func (s *Proxy) Start() error {
 	}
 	s.online = true
 	s.router.Start()
+	if s.jodis != nil {
+		s.jodis.Start()
+	}
 	return nil
 }
 
@@ -180,8 +183,8 @@ func (s *Proxy) Close() error {
 	s.closed = true
 	close(s.exit.C)
 
-	if s.xjodis != nil {
-		s.xjodis.Close()
+	if s.jodis != nil {
+		s.jodis.Close()
 	}
 	if s.ladmin != nil {
 		s.ladmin.Close()
@@ -415,9 +418,6 @@ func (s *Proxy) serveProxy() {
 	if d := s.config.BackendPingPeriod.Duration(); d != 0 {
 		go s.keepAlive(d)
 	}
-	if s.xjodis != nil {
-		s.xjodis.Start()
-	}
 
 	select {
 	case <-s.exit.C:

Original file line number	Diff line number	Diff line change
`@@ -45,13 +45,13 @@ type Proxy struct {`
`45`	`45`
`46`	`46`	`lproxy net.Listener`
`47`	`47`	`ladmin net.Listener`
`48`		`- xjodis *Jodis`
`49`	`48`
`50`	`49`	`ha struct {`
`51`	`50`	`monitor *redis.Sentinel`
`52`	`51`	`masters map[int]string`
`53`	`52`	`servers []string`
`54`	`53`	`}`
	`54`	`+ jodis *Jodis`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`var ErrClosedProxy = errors.New("use of closed proxy")`
`@@ -151,7 +151,7 @@ func (s Proxy) setup(config Config) error {`
`151`	`151`	`} else {`
`152`	`152`	`s.model.JodisPath = models.JodisPath(config.ProductName, s.model.Token)`
`153`	`153`	`}`
`154`		`- s.xjodis = NewJodis(c, s.model)`
	`154`	`+ s.jodis = NewJodis(c, s.model)`
`155`	`155`	`}`
`156`	`156`
`157`	`157`	`return nil`
`@@ -168,6 +168,9 @@ func (s *Proxy) Start() error {`
`168`	`168`	`}`
`169`	`169`	`s.online = true`
`170`	`170`	`s.router.Start()`
	`171`	`+ if s.jodis != nil {`
	`172`	`+ s.jodis.Start()`
	`173`	`+ }`
`171`	`174`	`return nil`
`172`	`175`	`}`
`173`	`176`
`@@ -180,8 +183,8 @@ func (s *Proxy) Close() error {`
`180`	`183`	`s.closed = true`
`181`	`184`	`close(s.exit.C)`
`182`	`185`
`183`		`- if s.xjodis != nil {`
`184`		`- s.xjodis.Close()`
	`186`	`+ if s.jodis != nil {`
	`187`	`+ s.jodis.Close()`
`185`	`188`	`}`
`186`	`189`	`if s.ladmin != nil {`
`187`	`190`	`s.ladmin.Close()`
`@@ -415,9 +418,6 @@ func (s *Proxy) serveProxy() {`
`415`	`418`	`if d := s.config.BackendPingPeriod.Duration(); d != 0 {`
`416`	`419`	`go s.keepAlive(d)`
`417`	`420`	`}`
`418`		`- if s.xjodis != nil {`
`419`		`- s.xjodis.Start()`
`420`		`- }`
`421`	`421`
`422`	`422`	`select {`
`423`	`423`	`case <-s.exit.C:`