cwinfo/yggdrasil-go
5
0
Fork 0
mirror of https://github.com/cwinfo/yggdrasil-go.git synced 2024-11-26 20:01:38 +00:00
Code Releases Activity

workaround to random timeouts

Browse Source
This commit is contained in:
Arceliar 2019-04-26 22:42:05 -05:00
parent 5d323861f0
commit 6469e39ff1
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/util/util.go
View File

@ -48,13 +48,12 @@ func PutBytes(bs []byte) {
// This is a workaround to go's broken timer implementation // This is a workaround to go's broken timer implementation
func TimerStop(t *time.Timer) bool { func TimerStop(t *time.Timer) bool {
if !t.Stop() { stopped := t.Stop()
select { select {
case <-t.C: case <-t.C:
default: default:
}
} }
return true return stopped
} }
// Run a blocking function with a timeout. // Run a blocking function with a timeout.

2
src/yggdrasil/conn.go
View File

@ -144,7 +144,7 @@ func (c *Conn) startSearch() {
} }
func getDeadlineTimer(value *atomic.Value) *time.Timer { func getDeadlineTimer(value *atomic.Value) *time.Timer {
timer := time.NewTimer(0) timer := time.NewTimer(24 * 365 * time.Hour) // FIXME for some reason setting this to 0 doesn't always let it stop and drain the channel correctly
util.TimerStop(timer) util.TimerStop(timer)
if deadline, ok := value.Load().(time.Time); ok { if deadline, ok := value.Load().(time.Time); ok {
timer.Reset(time.Until(deadline)) timer.Reset(time.Until(deadline))