From 025cfc204d940e51d832e3c6b2e0854c457b7491 Mon Sep 17 00:00:00 2001 From: Paul Lorenz Date: Thu, 6 May 2021 13:00:48 -0400 Subject: [PATCH] Move service list handler invoke out of decode loop --- router/handler_edge_ctrl/serviceList.go | 2 +- router/xgress_edge_tunnel/servicepoll.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/router/handler_edge_ctrl/serviceList.go b/router/handler_edge_ctrl/serviceList.go index ce03f7b36..51a84d551 100644 --- a/router/handler_edge_ctrl/serviceList.go +++ b/router/handler_edge_ctrl/serviceList.go @@ -66,6 +66,6 @@ func (self *ServiceListHandler) handleServicesList(list *edge_ctrl_pb.ServicesLi } serviceList = append(serviceList, service) - self.handler(list.LastUpdate, serviceList) } + self.handler(list.LastUpdate, serviceList) } diff --git a/router/xgress_edge_tunnel/servicepoll.go b/router/xgress_edge_tunnel/servicepoll.go index 01d6e57fc..3d2cbd882 100644 --- a/router/xgress_edge_tunnel/servicepoll.go +++ b/router/xgress_edge_tunnel/servicepoll.go @@ -80,7 +80,7 @@ func (self *servicePoller) handleServiceListUpdate(lastUpdateToken []byte, servi // Adds and Updates for _, s := range services { - self.services.Upsert(s.Name, s, func(exist bool, valueInMap interface{}, newValue interface{}) interface{} { + self.services.Upsert(s.Id, s, func(exist bool, valueInMap interface{}, newValue interface{}) interface{} { if !exist { self.serviceListener.HandleServicesChange(ziti.ServiceAdded, s) return s