Skip to content

Commit 11fd20d

Browse files
committed
fix: not wait for MaxHoldTime if AlwaysHold is true
1 parent b637607 commit 11fd20d

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
vendor/
1+
vendor/
2+
.idea/

keeper.go

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -145,12 +145,13 @@ func (k *ShutdownKeeper) Wait() {
145145
}
146146
<-k.shutdownEventChan
147147

148-
if !k.alwaysHold && k.getHoldTokenNum() == 0 {
149-
return
150-
}
151-
select {
152-
case <-time.After(k.maxHoldTime):
153-
case <-k.tokenReleaseChan:
148+
if k.alwaysHold {
149+
<-time.After(k.maxHoldTime)
150+
} else if k.getHoldTokenNum() > 0 {
151+
select {
152+
case <-time.After(k.maxHoldTime):
153+
case <-k.tokenReleaseChan:
154+
}
154155
}
155156
}
156157

0 commit comments

Comments
 (0)