debug

Author: marlonfan

go.mod

@@ -64,6 +64,7 @@ require (
 	go.uber.org/zap v1.13.0
 	golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37
 	golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2
+	golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e
 	golang.org/x/sys v0.0.0-20200523222454-059865788121 // indirect
 	golang.org/x/time v0.0.0-20191024005414-555d28b269f0 // indirect
 	google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1

registry/cache/cache.go

@@ -313,86 +313,81 @@ func (c *cache) update(res *registry.Result) {
 // run starts the cache watcher loop
 // it creates a new watcher if there's a problem
 func (c *cache) run(service string) {
-	c.Lock()
-	c.running = true
-	c.Unlock()
-
 	// reset watcher on exit
 	defer func() {
 		c.Lock()
-		c.watched = make(map[string]bool)
-		c.running = false
+		if _, ok := c.watched[service]; ok {
+			delete(c.watched, service)
+		}
 		c.Unlock()
 	}()
 
-	go func() {
-		var a, b int
+	var a, b int
 
-		for {
-			// exit early if already dead
+	for {
+		// exit early if already dead
+		if c.quit() {
+			return
+		}
+
+		// jitter before starting
+		j := rand.Int63n(100)
+		time.Sleep(time.Duration(j) * time.Millisecond)
+
+		// create new watcher
+		watchOption := func(wo *registry.WatchOptions) {
+			wo.Service = service
+		}
+		w, err := c.Registry.Watch(watchOption)
+		if err != nil {
 			if c.quit() {
 				return
 			}
 
-			// jitter before starting
-			j := rand.Int63n(100)
-			time.Sleep(time.Duration(j) * time.Millisecond)
+			d := backoff(a)
+			c.setStatus(err)
 
-			// create new watcher
-			watchOption := func(wo *registry.WatchOptions) {
-				wo.Service = service
-			}
-			w, err := c.Registry.Watch(watchOption)
-			if err != nil {
-				if c.quit() {
-					return
+			if a > 3 {
+				if logger.V(logger.DebugLevel, logger.DefaultLogger) {
+					logger.Debug("rcache: ", err, " backing off ", d)
 				}
+				a = 0
+			}
 
-				d := backoff(a)
-				c.setStatus(err)
+			time.Sleep(d)
+			a++
 
-				if a > 3 {
-					if logger.V(logger.DebugLevel, logger.DefaultLogger) {
-						logger.Debug("rcache: ", err, " backing off ", d)
-					}
-					a = 0
-				}
+			continue
+		}
 
-				time.Sleep(d)
-				a++
+		// reset a
+		a = 0
 
-				continue
+		// watch for events
+		if err := c.watch(w); err != nil {
+			if c.quit() {
+				return
 			}
 
-			// reset a
-			a = 0
-
-			// watch for events
-			if err := c.watch(w); err != nil {
-				if c.quit() {
-					return
-				}
-
-				d := backoff(b)
-				c.setStatus(err)
+			d := backoff(b)
+			c.setStatus(err)
 
-				if b > 3 {
-					if logger.V(logger.DebugLevel, logger.DefaultLogger) {
-						logger.Debug("rcache: ", err, " backing off ", d)
-					}
-					b = 0
+			if b > 3 {
+				if logger.V(logger.DebugLevel, logger.DefaultLogger) {
+					logger.Debug("rcache: ", err, " backing off ", d)
 				}
-
-				time.Sleep(d)
-				b++
-
-				continue
+				b = 0
 			}
 
-			// reset b
-			b = 0
+			time.Sleep(d)
+			b++
+
+			continue
 		}
-	}()
+
+		// reset b
+		b = 0
+	}
 }
 
 // watch loops the next event and calls update