⚙️ be consistent and consume context while opening stream

mudler · Feb 2, 2022 · 516904f · 516904f
1 parent d293fa3
commit 516904f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/pkg/services/files.go b/pkg/services/files.go
@@ -156,7 +156,7 @@ func ReceiveFile(ctx context.Context, ledger *blockchain.Ledger, n *node.Node, l
 				}
 
 				// Open a stream
-				stream, err := n.Host().NewStream(context.Background(), d, protocol.FileProtocol.ID())
+				stream, err := n.Host().NewStream(ctx, d, protocol.FileProtocol.ID())
 				if err != nil {
 					l.Debugf("failed to dial %s, retrying in 5 seconds", d)
 					continue

diff --git a/pkg/services/services.go b/pkg/services/services.go
@@ -170,8 +170,8 @@ func ConnectToService(ctx context.Context, ledger *blockchain.Ledger, node *node
 				go copyStream(closer, conn, stream)
 				<-closer
 
-				conn.Close()
 				stream.Close()
+				conn.Close()
 				ll.Infof("(service %s) Done handling %s", serviceID, l.Addr().String())
 			}()
 		}