curben
/
cloudflared-mirror
mirror of https://github.com/cloudflare/cloudflared.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

TUN-5142: defer close rpcconn inside unregister instead of ServeControlStream

This commit is contained in:
Sudarsan Reddy 2021-09-24 12:56:31 +01:00
parent 27e1277a3b
commit d7da74cb9e
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
connection/control.go
View File

@ -64,9 +64,9 @@ func (c *controlStream) ServeControlStream(
shouldWaitForUnregister bool, shouldWaitForUnregister bool,
) error { ) error {
rpcClient := c.newRPCClientFunc(ctx, rw, c.observer.log) rpcClient := c.newRPCClientFunc(ctx, rw, c.observer.log)
defer rpcClient.Close()
if err := rpcClient.RegisterConnection(ctx, c.namedTunnelConfig, connOptions, c.connIndex, c.observer); err != nil { if err := rpcClient.RegisterConnection(ctx, c.namedTunnelConfig, connOptions, c.connIndex, c.observer); err != nil {
rpcClient.Close()
return err return err
} }
c.connectedFuse.Connected() c.connectedFuse.Connected()
@ -82,6 +82,7 @@ func (c *controlStream) ServeControlStream(
func (c *controlStream) waitForUnregister(ctx context.Context, rpcClient NamedTunnelRPCClient) { func (c *controlStream) waitForUnregister(ctx context.Context, rpcClient NamedTunnelRPCClient) {
// wait for connection termination or start of graceful shutdown // wait for connection termination or start of graceful shutdown
defer rpcClient.Close()
select { select {
case <-ctx.Done(): case <-ctx.Done():
break break