yesBad/proton-bridge
1
0
Fork 0
forked from Silverfish/proton-bridge
Code Actions Activity

refactor: better confirmer result locking

Browse Source
This commit is contained in:
James Houlahan
2020-07-24 14:50:08 +02:00
parent d66bcc4b63
commit b12ef1327c
2 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
pkg/confirmer/request.go
View File

@ -51,11 +51,14 @@ func (r *Request) ID() string {
// Result returns the result or an error if it is not available within the request timeout.
func (r *Request) Result() (bool, error) {
if r.hasExpired() {
r.locker.Lock()
defer r.locker.Unlock()
if r.expired {
return false, errors.New("this result has expired")
}
defer r.done()
defer func() { r.expired = true }()
select {
case res := <-r.ch:
@ -65,17 +68,3 @@ func (r *Request) Result() (bool, error) {
return false, errors.New("timed out waiting for result")
}
}
func (r *Request) hasExpired() bool {
r.locker.Lock()
defer r.locker.Unlock()
return r.expired
}
func (r *Request) done() {
r.locker.Lock()
defer r.locker.Unlock()
r.expired = true
}