Skip to content

Commit

Permalink
test(shutdown):add shutdown internal signal test
Browse files Browse the repository at this point in the history
  • Loading branch information
zhaoyunxing92 committed Aug 4, 2022
1 parent 57055dc commit aab693f
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 3 deletions.
2 changes: 1 addition & 1 deletion config/graceful_shutdown.go
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ func gracefulShutdownInit() {
filter.Set(constant.GracefulShutdownFilterShutdownConfig, GetShutDown())
}

if GetShutDown().InternalSignal {
if GetShutDown().GetInternalSignal() {
signals := make(chan os.Signal, 1)
signal.Notify(signals, ShutdownSignals...)

Expand Down
9 changes: 8 additions & 1 deletion config/graceful_shutdown_config.go
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,13 @@ func (config *ShutdownConfig) GetConsumerUpdateWaitTime() time.Duration {
return result
}

func (config *ShutdownConfig) GetInternalSignal() bool {
if config.InternalSignal == nil {
return false
}
return *config.InternalSignal
}

func (config *ShutdownConfig) Init() error {
return defaults.Set(config)
}
Expand Down Expand Up @@ -162,7 +169,7 @@ func (scb *ShutdownConfigBuilder) SetInternalSignal(internalSignal bool) *Shutdo
}

func (scb *ShutdownConfigBuilder) Build() *ShutdownConfig {
defaults.Set(scb)
defaults.MustSet(scb.shutdownConfig)
return scb.shutdownConfig
}

Expand Down
16 changes: 15 additions & 1 deletion config/graceful_shutdown_config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ func TestNewShutDownConfigBuilder(t *testing.T) {
SetOfflineRequestWindowTimeout("13s").
SetRejectRequestHandler("handler").
SetRejectRequest(true).
SetInternalSignal(true).
SetInternalSignal(false).
Build()

assert.Equal(t, config.Prefix(), constant.ShutdownConfigPrefix)
Expand All @@ -86,4 +86,18 @@ func TestNewShutDownConfigBuilder(t *testing.T) {

waitTime := config.GetConsumerUpdateWaitTime()
assert.Equal(t, waitTime, 3*time.Second)

assert.Equal(t, config.GetInternalSignal(), false)
}

func TestGetInternalSignal(t *testing.T) {
config := NewShutDownConfigBuilder().
SetTimeout("10s").
SetStepTimeout("15s").
SetOfflineRequestWindowTimeout("13s").
SetRejectRequestHandler("handler").
SetRejectRequest(true).
Build()

assert.Equal(t, config.GetInternalSignal(), true)
}

0 comments on commit aab693f

Please sign in to comment.