Merge pull request #800 from kordenlu/master

fix rcache node overwrited issue

registry/consul/watcher.go

@@ -163,7 +163,7 @@ func (cw *consulWatcher) serviceHandler(idx uint64, data interface{}) {
 
 			// it's an update rather than creation
 			if len(nodes) > 0 {
-				delService := oldService
+				delService := registry.CopyService(oldService)
 				delService.Nodes = nodes
 				cw.next <- &registry.Result{Action: "delete", Service: delService}
 			}

registry/util.go

@@ -48,10 +48,8 @@ func delNodes(old, del []*Node) []*Node {
 	return nodes
 }
 
-// Copy makes a copy of services
-func Copy(current []*Service) []*Service {
-	services := make([]*Service, len(current))
-	for i, service := range current {
+// CopyService make a copy of service
+func CopyService(service *Service) *Service {
 	// copy service
 	s := new(Service)
 	*s = *service
@@ -73,11 +71,15 @@ func Copy(current []*Service) []*Service {
 		eps[j] = e
 	}
 	s.Endpoints = eps
+	return s
+}
 
-		// append service
-		services[i] = s
+// Copy makes a copy of services
+func Copy(current []*Service) []*Service {
+	services := make([]*Service, len(current))
+	for i, service := range current {
+		services[i] = CopyService(service)
 	}
-
 	return services
 }