jinql
/
gocron
mirror of https://github.com/ouqiang/gocron
1
0
Fork 0
Code Issues Releases Wiki Activity

修复goroutine未正常退出

pull/21/merge
ouqiang 2017-04-12 14:12:34 +08:00
parent d6a5399da9
commit dfcedb7069
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/ssh/ssh.go
View File

@ -27,7 +27,6 @@ func Exec(sshConfig SSHConfig, cmd string) (output string, err error) {
var timeoutChan chan bool = make(chan bool) var timeoutChan chan bool = make(chan bool)
go execCommand(sshConfig, cmd, resultChan) go execCommand(sshConfig, cmd, resultChan)
go triggerTimeout(timeoutChan, sshConfig.ExecTimeout) go triggerTimeout(timeoutChan, sshConfig.ExecTimeout)
select { select {
case result := <- resultChan: case result := <- resultChan:
output = result.Output output = result.Output
@ -81,5 +80,5 @@ func triggerTimeout(ch chan bool, timeout int){
timeout = 86400 timeout = 86400
} }
time.Sleep(time.Duration(timeout) * time.Second) time.Sleep(time.Duration(timeout) * time.Second)
ch <- true close(ch)
} }