Merge pull request #833 from mrpalide/bugfix/panic-on-shutdown

Bugfix/panic on shutdown
skycoin · Jul 7, 2021 · a663372 · a663372
2 parents 4fcac2a + a0bc9c9
commit a663372
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 12 deletions.
diff --git a/pkg/snet/arclient/client.go b/pkg/snet/arclient/client.go
@@ -432,10 +432,9 @@ func (c *httpClient) Close() error {
 		if err := c.sudphConn.Close(); err != nil {
 			c.log.WithError(err).Errorf("Failed to close SUDPH")
 		}
+		close(c.closed)
 	}
 
-	close(c.closed)
-
 	return nil
 }
 

diff --git a/pkg/snet/network.go b/pkg/snet/network.go
@@ -274,18 +274,13 @@ func (n *Network) Close() error {
 		if directClient == nil {
 			continue
 		}
-		wg.Add(1)
-		go func(client directtp.Client) {
-			err := client.Close()
-			if err != nil {
-				directErrors <- err
-			}
-			wg.Done()
-		}(directClient)
+		err := directClient.Close()
+		if err != nil {
+			directErrors <- err
+		}
 	}
-	wg.Wait()
 	close(directErrors)
-
+	wg.Wait()
 	if dmsgErr != nil {
 		return dmsgErr
 	}