merith-tk/forgejo-runner
1
0
Fork 0
Code Issues Pull requests 2 Projects Releases Packages Wiki Activity Actions

feat: shutdown_timeout == timeout by default

Browse source
This commit is contained in:
Earl Warren 2024-06-03 15:18:56 +02:00
parent 30029567f7
commit 31b3de2c96
No known key found for this signature in database
GPG key ID: 0579CB2928A78A00
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
internal/pkg/config/config.example.yaml
View file

@ -25,7 +25,8 @@ runner:
timeout: 3h timeout: 3h
# The timeout for the runner to wait for running jobs to finish when shutting down. # The timeout for the runner to wait for running jobs to finish when shutting down.
# Any running jobs that haven't finished after this timeout will be cancelled. # Any running jobs that haven't finished after this timeout will be cancelled.
shutdown_timeout: 0s # Defaults to the same value as timeout if unset or 0.
shutdown_timeout: 3h
# Whether skip verifying the TLS certificate of the instance. # Whether skip verifying the TLS certificate of the instance.
insecure: false insecure: false
# The timeout for fetching the job from the Forgejo instance. # The timeout for fetching the job from the Forgejo instance.

3
internal/pkg/config/config.go
View file

@ -121,6 +121,9 @@ func LoadDefault(file string) (*Config, error) {
if cfg.Runner.Timeout <= 0 { if cfg.Runner.Timeout <= 0 {
cfg.Runner.Timeout = 3 * time.Hour cfg.Runner.Timeout = 3 * time.Hour
} }
if cfg.Runner.ShutdownTimeout <= 0 {
cfg.Runner.ShutdownTimeout = cfg.Runner.Timeout
}
if cfg.Cache.Enabled == nil { if cfg.Cache.Enabled == nil {
b := true b := true
cfg.Cache.Enabled = &b cfg.Cache.Enabled = &b