opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

cloudproxy: agent: ssh: wait ssh conn state while passing it out

Browse Source
This commit is contained in:
Yousong Zhou
2021-05-10 13:43:07 +08:00
parent 0319f28da6
commit 1457b37c7d
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/cloudproxy/agent/ssh/client.go
+8 -7
View File
@@ -178,7 +178,7 @@ func (c *Client) Start(ctx context.Context) {
}
}
func (c *Client) runClientState(ctx context.Context, sshClientC chan *ssh.Client) {
func (c *Client) runClientState(ctx context.Context, sshClientC chan<- *ssh.Client) {
for {
select {
case <-ctx.Done():
@@ -203,12 +203,6 @@ func (c *Client) runClientState(ctx context.Context, sshClientC chan *ssh.Client
func() {
defer sshc.Conn.Close()
select {
case sshClientC <- sshc:
case <-ctx.Done():
return
}
closeC := make(chan struct{})
go func() {
defer close(closeC)
@@ -219,6 +213,13 @@ func (c *Client) runClientState(ctx context.Context, sshClientC chan *ssh.Client
}
}()
select {
case sshClientC <- sshc:
case <-closeC:
case <-ctx.Done():
return
}
select {
case <-closeC:
case <-ctx.Done():