Close connections on cluster shutdown

Author: salvacorts

mlp-ea-decentralized/common/ga/cluster.go

@@ -102,6 +102,7 @@ func (c *Cluster) Start(metadata NodeMetadata) {
 
 	c.list = list
 	c.Logger.Infof("Local cluster node: %s", c.list.LocalNode().String())
+	defer c.list.Shutdown()
 
 	// Try to join a cluster with bootstap nodes.
 	// If it fails, be an standalone node waiting for incoming connections

mlp-ea-decentralized/common/ga/cluster_test.go

@@ -8,8 +8,8 @@ import (
 func TestCluster(t *testing.T) {
 	recvBestChan := make(chan Individual, 100)
 
-	peer1 := MakeCluster(9998, 100, nil, []string{})
-	peer2 := MakeCluster(9999, 100, recvBestChan, []string{"127.0.0.1:9998"})
+	peer1 := MakeCluster(6666, 100, nil, []string{})
+	peer2 := MakeCluster(6667, 100, recvBestChan, []string{"127.0.0.1:6666"})
 
 	// Launch First peer and wait for it to be ready
 	go peer1.Start(NodeMetadata{})

mlp-ea-decentralized/common/ga/poolModel.go

@@ -343,13 +343,14 @@ func (pool *PoolModel) handleEvaluate() {
 	if err != nil {
 		Log.Fatalf("Failed to listen: %v", err)
 	}
+	defer lisNative.Close()
 
 	// Setup listener for wasm clients based on websockets
 	lisWasm, err := ws.Listen(fmt.Sprintf("ws://%s:%d", listenAddr, wasmPort), nil)
 	if err != nil {
 		panic(err)
 	}
-	defer lisNative.Close()
+	defer lisWasm.Close()
 
 	Log.Infof("gRPC Listening on %s", lisNative.Addr().String())
 	go pool.grpcServer.Serve(lisNative)
@@ -360,6 +361,7 @@ func (pool *PoolModel) handleEvaluate() {
 	// Wait until stop is received
 	select {
 	case <-pool.stop:
+		return
 	}
 }