fix: resolve the build failures

This commit is contained in:
Andy Pan 2022-12-20 22:29:21 +08:00
parent b6eaea118b
commit 88d2454bbb
2 changed files with 10 additions and 6 deletions

View File

@ -286,12 +286,14 @@ func (p *Pool) Release() {
// ReleaseTimeout is like Release but with a timeout, it waits all workers to exit before timing out. // ReleaseTimeout is like Release but with a timeout, it waits all workers to exit before timing out.
func (p *Pool) ReleaseTimeout(timeout time.Duration) error { func (p *Pool) ReleaseTimeout(timeout time.Duration) error {
if p.IsClosed() || p.stopPurge == nil || p.stopTicktock == nil { if p.IsClosed() || (!p.options.DisablePurge && p.stopPurge == nil) || p.stopTicktock == nil {
return ErrPoolClosed return ErrPoolClosed
} }
if p.stopPurge != nil {
p.stopPurge() p.stopPurge()
p.stopPurge = nil p.stopPurge = nil
}
p.stopTicktock() p.stopTicktock()
p.stopTicktock = nil p.stopTicktock = nil
p.Release() p.Release()

View File

@ -315,12 +315,14 @@ func (p *PoolWithFunc) Release() {
// ReleaseTimeout is like Release but with a timeout, it waits all workers to exit before timing out. // ReleaseTimeout is like Release but with a timeout, it waits all workers to exit before timing out.
func (p *PoolWithFunc) ReleaseTimeout(timeout time.Duration) error { func (p *PoolWithFunc) ReleaseTimeout(timeout time.Duration) error {
if p.IsClosed() || p.stopPurge == nil || p.stopTicktock == nil { if p.IsClosed() || (!p.options.DisablePurge && p.stopPurge == nil) || p.stopTicktock == nil {
return ErrPoolClosed return ErrPoolClosed
} }
if p.stopPurge != nil {
p.stopPurge() p.stopPurge()
p.stopPurge = nil p.stopPurge = nil
}
p.stopTicktock() p.stopTicktock()
p.stopTicktock = nil p.stopTicktock = nil
p.Release() p.Release()