admin/gluetun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore(env): do not validate control server port

Browse Source
This commit is contained in:
Quentin McGaw
2022-01-29 14:28:36 +00:00
parent 57481e3dd7
commit fd23f1a29b
1 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
internal/configuration/sources/env/server.go vendored
View File

@@ -6,7 +6,6 @@ import (
"github.com/qdm12/gluetun/internal/configuration/settings" "github.com/qdm12/gluetun/internal/configuration/settings"
"github.com/qdm12/govalid/binary" "github.com/qdm12/govalid/binary"
"github.com/qdm12/govalid/port"
) )
func (r *Reader) readControlServer() (controlServer settings.ControlServer, err error) { func (r *Reader) readControlServer() (controlServer settings.ControlServer, err error) {
@@ -15,10 +14,7 @@ func (r *Reader) readControlServer() (controlServer settings.ControlServer, err
return controlServer, err return controlServer, err
} }
controlServer.Address, err = r.readControlServerAddress() controlServer.Address = r.readControlServerAddress()
if err != nil {
return controlServer, err
}
return controlServer, nil return controlServer, nil
} }
@@ -37,23 +33,19 @@ func readControlServerLog() (enabled *bool, err error) {
return &log, nil return &log, nil
} }
func (r *Reader) readControlServerAddress() (address *string, err error) { func (r *Reader) readControlServerAddress() (address *string) {
// Retro-compatibility // Retro-compatibility
s := os.Getenv("HTTP_CONTROL_SERVER_PORT") s := os.Getenv("HTTP_CONTROL_SERVER_PORT")
if s != "" { if s != "" {
r.onRetroActive("HTTP_CONTROL_SERVER_PORT", "HTTP_CONTROL_SERVER_ADDRESS") r.onRetroActive("HTTP_CONTROL_SERVER_PORT", "HTTP_CONTROL_SERVER_ADDRESS")
port, err := port.Validate(s)
if err != nil {
return nil, fmt.Errorf("environment variable HTTP_CONTROL_SERVER_PORT: %w", err)
}
address = new(string) address = new(string)
*address = ":" + fmt.Sprint(port) *address = ":" + s
return address, nil return address
} }
s = os.Getenv("HTTP_CONTROL_SERVER_ADDRESS") s = os.Getenv("HTTP_CONTROL_SERVER_ADDRESS")
if s == "" { if s == "" {
return nil, nil //nolint:nilnil return nil
} }
return &s, nil return &s
} }