support envs as well for new crawler sub-system (#11033)

This commit is contained in:
Harshavardhana 2020-12-04 21:54:24 -08:00 committed by GitHub
parent 6ff12f5f01
commit 3514e89eb3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -21,12 +21,16 @@ import (
"time" "time"
"github.com/minio/minio/cmd/config" "github.com/minio/minio/cmd/config"
"github.com/minio/minio/pkg/env"
) )
// Compression environment variables // Compression environment variables
const ( const (
Delay = "delay" Delay = "delay"
MaxWait = "max_wait" MaxWait = "max_wait"
EnvDelay = "MINIO_CRAWLER_DELAY"
EnvMaxWait = "MINIO_CRAWLER_MAX_WAIT"
) )
// Config represents the heal settings. // Config represents the heal settings.
@ -54,13 +58,13 @@ var (
Help = config.HelpKVS{ Help = config.HelpKVS{
config.HelpKV{ config.HelpKV{
Key: Delay, Key: Delay,
Description: `crawler delay multiplier, default 10`, Description: `crawler delay multiplier, defaults to '10.0'`,
Optional: true, Optional: true,
Type: "float", Type: "float",
}, },
config.HelpKV{ config.HelpKV{
Key: MaxWait, Key: MaxWait,
Description: `maximum wait time between operations, default 15s`, Description: `maximum wait time between operations, defaults to '15s'`,
Optional: true, Optional: true,
Type: "duration", Type: "duration",
}, },
@ -72,13 +76,11 @@ func LookupConfig(kvs config.KVS) (cfg Config, err error) {
if err = config.CheckValidKeys(config.CrawlerSubSys, kvs, DefaultKVS); err != nil { if err = config.CheckValidKeys(config.CrawlerSubSys, kvs, DefaultKVS); err != nil {
return cfg, err return cfg, err
} }
delay := kvs.Get(Delay) cfg.Delay, err = strconv.ParseFloat(env.Get(EnvDelay, kvs.Get(Delay)), 64)
cfg.Delay, err = strconv.ParseFloat(delay, 64)
if err != nil { if err != nil {
return cfg, err return cfg, err
} }
wait := kvs.Get(MaxWait) cfg.MaxWait, err = time.ParseDuration(env.Get(EnvMaxWait, kvs.Get(MaxWait)))
cfg.MaxWait, err = time.ParseDuration(wait)
if err != nil { if err != nil {
return cfg, err return cfg, err
} }