github
/
v2ray-core
mirror of https://github.com/v2ray/v2ray-core
1
0
Fork 0
Code Issues Releases Wiki Activity

close timer sooner

pull/467/head^2
Darien Raymond 2017-01-31 12:54:01 +01:00
parent c462e35aad
commit 23a8da215f
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
common/signal/timer.go
View File

@ -21,14 +21,21 @@ func (t *ActivityTimer) UpdateActivity() {
func (t *ActivityTimer) run() { func (t *ActivityTimer) run() {
for { for {
time.Sleep(t.timeout)
select { select {
case <-t.ctx.Done(): case <-time.After(t.timeout):
return
case <-t.updated:
default:
t.cancel() t.cancel()
return return
case <-t.ctx.Done():
return
default:
select {
case <-time.After(t.timeout):
t.cancel()
return
case <-t.ctx.Done():
return
case <-t.updated:
}
} }
} }
} }