chore(sources/env): bump gosettings to v0.3.0-rc9
This commit is contained in:
20
internal/configuration/sources/env/server.go
vendored
20
internal/configuration/sources/env/server.go
vendored
@@ -1,15 +1,12 @@
|
||||
package env
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
|
||||
"github.com/qdm12/gluetun/internal/configuration/settings"
|
||||
"github.com/qdm12/gosettings/sources/env"
|
||||
"github.com/qdm12/govalid/binary"
|
||||
)
|
||||
|
||||
func (s *Source) readControlServer() (controlServer settings.ControlServer, err error) {
|
||||
controlServer.Log, err = readControlServerLog()
|
||||
controlServer.Log, err = env.BoolPtr("HTTP_CONTROL_SERVER_LOG")
|
||||
if err != nil {
|
||||
return controlServer, err
|
||||
}
|
||||
@@ -19,27 +16,18 @@ func (s *Source) readControlServer() (controlServer settings.ControlServer, err
|
||||
return controlServer, nil
|
||||
}
|
||||
|
||||
func readControlServerLog() (enabled *bool, err error) {
|
||||
s := env.Get("HTTP_CONTROL_SERVER_LOG")
|
||||
log, err := binary.Validate(s)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("environment variable HTTP_CONTROL_SERVER_LOG: %w", err)
|
||||
}
|
||||
return log, nil
|
||||
}
|
||||
|
||||
func (s *Source) readControlServerAddress() (address *string) {
|
||||
key, value := s.getEnvWithRetro("HTTP_CONTROL_SERVER_ADDRESS",
|
||||
[]string{"CONTROL_SERVER_ADDRESS"})
|
||||
if value == "" {
|
||||
if value == nil {
|
||||
return nil
|
||||
}
|
||||
|
||||
if key == "HTTP_CONTROL_SERVER_ADDRESS" {
|
||||
return &value
|
||||
return value
|
||||
}
|
||||
|
||||
address = new(string)
|
||||
*address = ":" + value
|
||||
*address = ":" + *value
|
||||
return address
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user