Fix integration failure

easegress-io · Nov 30, 2023 · 2dbab3b · 2dbab3b
1 parent 6bd6e48
commit 2dbab3b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/build/test/integration_test.go b/build/test/integration_test.go
@@ -318,7 +318,7 @@ func TestEgctlCmd(t *testing.T) {
 		output, stderr, err := runCmd(cmd)
 		assert.NoError(err)
 		assert.Empty(stderr)
-		head := []string{"NAME", "ALIASES", "KIND", "ACTION"}
+		head := []string{"NAME", "ALIASES", "CATEGORY", "KIND", "ACTION"}
 		assert.True(matchTable(head, output))
 		assert.True(matchTable([]string{"member", "m,mem,members", "Member", "delete,get,describe"}, output))
 		assert.Contains(output, "create,apply,delete,get,describe")
@@ -623,7 +623,7 @@ func TestLogs(t *testing.T) {
 		// check if new logs are printed
 		yamlStr := `
 kind: HTTPServer
-name: test-egctl-logs        
+name: test-egctl-logs
 port: 12345
 rules:
 - paths:

diff --git a/pkg/object/rawconfigtrafficcontroller/rawconfigtrafficcontroller.go b/pkg/object/rawconfigtrafficcontroller/rawconfigtrafficcontroller.go
@@ -92,8 +92,10 @@ func (rctc *RawConfigTrafficController) Init(superSpec *supervisor.Spec) {
 func (rctc *RawConfigTrafficController) Inherit(superSpec *supervisor.Spec, previousGeneration supervisor.Object) {
 	rctc.superSpec, rctc.spec = superSpec, superSpec.ObjectSpec().(*Spec)
 
-	watcher := previousGeneration.(*RawConfigTrafficController).watcher
-	previousGeneration.Close()
+	// Close will clean all the using resources.
+	prev := previousGeneration.(*RawConfigTrafficController)
+	watcher := prev.watcher
+	close(prev.done)
 
 	rctc.reload(watcher)
 }