diff options
| author | René 'Necoro' Neumann <necoro@necoro.eu> | 2020-05-01 18:18:40 +0200 |
|---|---|---|
| committer | René 'Necoro' Neumann <necoro@necoro.eu> | 2020-05-01 18:18:40 +0200 |
| commit | 9bd0c60e5007dc30808b7eef17a091fb248d54d6 (patch) | |
| tree | 6b5837e2fe9d48b1ce18ccef1d87bc5098a91afb /pkg/config/yaml.go | |
| parent | 8afa4a29d793e84007666083158e198cf2b8557d (diff) | |
| download | feed2imap-go-9bd0c60e5007dc30808b7eef17a091fb248d54d6.tar.gz feed2imap-go-9bd0c60e5007dc30808b7eef17a091fb248d54d6.tar.bz2 feed2imap-go-9bd0c60e5007dc30808b7eef17a091fb248d54d6.zip | |
Print warning on deprecated options. Handle "disable-ssl-verification"
Diffstat (limited to '')
| -rw-r--r-- | pkg/config/yaml.go | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pkg/config/yaml.go b/pkg/config/yaml.go index e8dc401..1afba0a 100644 --- a/pkg/config/yaml.go +++ b/pkg/config/yaml.go @@ -86,10 +86,10 @@ func (cfg *Config) fixGlobalOptions(unparsed Map) { newOpts, _ := buildOptions(&cfg.FeedOptions, unparsed) - for k := range origMap { + for k, v := range origMap { if _, ok := unparsed[k]; !ok { log.Warnf("Global option '%s' should be inside the 'options' map. It currently overwrites the same key there.", k) - } else { + } else if !handleDeprecated(k, v, "", &cfg.GlobalOptions, &newOpts) { log.Warnf("Unknown global option '%s'. Ignored!", k) } } @@ -199,7 +199,9 @@ func buildFeeds(cfg []configGroupFeed, target []string, feeds Feeds, globalFeedO opt, unknown := buildOptions(globalFeedOptions, f.Options) for _, optName := range unknown { - log.Warnf("Unknown option '%s' for feed '%s'. Ignored!", optName, name) + if !handleDeprecated(optName, f.Options[optName], name, nil, &opt) { + log.Warnf("Unknown option '%s' for feed '%s'. Ignored!", optName, name) + } } feedCopy.Options = opt |