MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-04-23 11:55:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: honor older scanner settings only if newer has not changed (#17564)

Browse Source
This commit is contained in:
Harshavardhana 2023-07-03 12:28:36 -07:00 committed by GitHub
parent 15fd5ce2fa
commit 22f5bc643c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
internal/config/scanner/scanner.go
View File

@ -85,14 +85,17 @@ func LookupConfig(kvs config.KVS) (cfg Config, err error) {
return cfg, err return cfg, err
} }
// Stick to loading deprecated config/env if they are already set // Stick to loading deprecated config/env if they are already set, and the Speed value
if kvs.Get(Delay) != "" && kvs.Get(MaxWait) != "" && kvs.Get(Cycle) != "" { // has not been changed from its "default" value, if it has been changed honor new settings.
return lookupDeprecatedScannerConfig(kvs) if kvs.GetWithDefault(Speed, DefaultKVS) == "default" {
if kvs.Get(Delay) != "" && kvs.Get(MaxWait) != "" {
return lookupDeprecatedScannerConfig(kvs)
}
} }
switch speed := env.Get(EnvSpeed, kvs.GetWithDefault(Speed, DefaultKVS)); speed { switch speed := env.Get(EnvSpeed, kvs.GetWithDefault(Speed, DefaultKVS)); speed {
case "fastest": case "fastest":
cfg.Delay, cfg.MaxWait, cfg.Cycle = 0, 0, 0 cfg.Delay, cfg.MaxWait, cfg.Cycle = 0, 0, time.Second
case "fast": case "fast":
cfg.Delay, cfg.MaxWait, cfg.Cycle = 1, 100*time.Millisecond, time.Minute cfg.Delay, cfg.MaxWait, cfg.Cycle = 1, 100*time.Millisecond, time.Minute
case "default": case "default":