chore(env): bump qdm12/gosettings to v0.3.0-rc11
This commit is contained in:
16
internal/configuration/sources/env/reader.go
vendored
16
internal/configuration/sources/env/reader.go
vendored
@@ -1,11 +1,14 @@
|
||||
package env
|
||||
|
||||
import (
|
||||
"os"
|
||||
|
||||
"github.com/qdm12/gluetun/internal/configuration/settings"
|
||||
"github.com/qdm12/gosettings/sources/env"
|
||||
)
|
||||
|
||||
type Source struct {
|
||||
env env.Env
|
||||
warner Warner
|
||||
}
|
||||
|
||||
@@ -15,6 +18,7 @@ type Warner interface {
|
||||
|
||||
func New(warner Warner) *Source {
|
||||
return &Source{
|
||||
env: *env.New(os.Environ()),
|
||||
warner: warner,
|
||||
}
|
||||
}
|
||||
@@ -47,7 +51,7 @@ func (s *Source) Read() (settings settings.Settings, err error) {
|
||||
return settings, err
|
||||
}
|
||||
|
||||
settings.Log, err = readLog()
|
||||
settings.Log, err = s.readLog()
|
||||
if err != nil {
|
||||
return settings, err
|
||||
}
|
||||
@@ -57,12 +61,12 @@ func (s *Source) Read() (settings settings.Settings, err error) {
|
||||
return settings, err
|
||||
}
|
||||
|
||||
settings.Updater, err = readUpdater()
|
||||
settings.Updater, err = s.readUpdater()
|
||||
if err != nil {
|
||||
return settings, err
|
||||
}
|
||||
|
||||
settings.Version, err = readVersion()
|
||||
settings.Version, err = s.readVersion()
|
||||
if err != nil {
|
||||
return settings, err
|
||||
}
|
||||
@@ -82,7 +86,7 @@ func (s *Source) Read() (settings settings.Settings, err error) {
|
||||
return settings, err
|
||||
}
|
||||
|
||||
settings.Pprof, err = readPprof()
|
||||
settings.Pprof, err = s.readPprof()
|
||||
if err != nil {
|
||||
return settings, err
|
||||
}
|
||||
@@ -107,12 +111,12 @@ func (s *Source) getEnvWithRetro(currentKey string,
|
||||
// We check retro-compatibility keys first since
|
||||
// the current key might be set in the Dockerfile.
|
||||
for _, key = range retroKeys {
|
||||
value = env.Get(key, options...)
|
||||
value = s.env.Get(key, options...)
|
||||
if value != nil {
|
||||
s.onRetroActive(key, currentKey)
|
||||
return key, value
|
||||
}
|
||||
}
|
||||
|
||||
return currentKey, env.Get(currentKey, options...)
|
||||
return currentKey, s.env.Get(currentKey, options...)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user