Address comments

linkedin · Feb 7, 2025 · d524e22 · d524e22
1 parent 33fc4b6
commit d524e22
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/internal/server/subscription_manager.go b/internal/server/subscription_manager.go
@@ -195,10 +195,7 @@ func (c *subscriptionManagerCore) UnsubscribeAll() {
 }
 
 func (c *subscriptionManagerCore) subscribe(name string) {
-	unsub, ok := c.subscriptions[name]
-	if ok {
-		unsub()
-	}
+	c.unsubscribe(name)
 	c.subscriptions[name] = c.locator.Subscribe(c.ctx, c.typeURL, name, c.handler)
 }
 

diff --git a/server_test.go b/server_test.go
@@ -661,10 +661,10 @@ func TestImplicitWildcardSubscription(t *testing.T) {
 	h := NewNoopBatchSubscriptionHandler(t)
 	typeURL := TypeOf[*ads.Secret]().URL()
 
-	newMockLocator := func(t *testing.T) (rs mockResourceLocator, wildcardSub, fooSub chan struct{}) {
+	newMockLocator := func(t *testing.T) (l mockResourceLocator, wildcardSub, fooSub chan struct{}) {
 		wildcardSub = make(chan struct{}, 1)
 		fooSub = make(chan struct{}, 1)
-		rs = func(actualTypeURL, resourceName string) func() {
+		l = func(actualTypeURL, resourceName string) func() {
 			require.Equal(t, typeURL, actualTypeURL)
 			switch resourceName {
 			case ads.WildcardSubscription:
@@ -682,7 +682,7 @@ func TestImplicitWildcardSubscription(t *testing.T) {
 				return nil
 			}
 		}
-		return rs, wildcardSub, fooSub
+		return l, wildcardSub, fooSub
 	}
 	requireSelect := func(t *testing.T, ch <-chan struct{}, shouldBeClosed bool) {
 		t.Helper()