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

hotfix(settings): fix retro-compatible key message

Browse Source
This commit is contained in:
Quentin McGaw
2024-04-01 12:59:43 +00:00
parent e859c60343
commit 4019ee3ea1
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
internal/configuration/settings/httpproxy.go
View File

@@ -151,7 +151,8 @@ func (h *HTTPProxy) read(r *reader.Reader) (err error) {
func readHTTProxyListeningAddress(r *reader.Reader) (listeningAddress string, err error) { func readHTTProxyListeningAddress(r *reader.Reader) (listeningAddress string, err error) {
// Retro-compatible keys using a port only // Retro-compatible keys using a port only
port, err := r.Uint16Ptr("", port, err := r.Uint16Ptr("",
reader.RetroKeys("HTTPPROXY_PORT", "TINYPROXY_PORT", "PROXY_PORT")) reader.RetroKeys("HTTPPROXY_PORT", "TINYPROXY_PORT", "PROXY_PORT"),
reader.IsRetro("HTTPPROXY_LISTENING_ADDRESS"))
if err != nil { if err != nil {
return "", err return "", err
} else if port != nil { } else if port != nil {
@@ -162,12 +163,13 @@ func readHTTProxyListeningAddress(r *reader.Reader) (listeningAddress string, er
} }
func readHTTProxyLog(r *reader.Reader) (enabled *bool, err error) { func readHTTProxyLog(r *reader.Reader) (enabled *bool, err error) {
const currentKey = "HTTPPROXY_LOG"
// Retro-compatible keys using different boolean verbs // Retro-compatible keys using different boolean verbs
value := r.String("", value := r.String("",
reader.RetroKeys("PROXY_LOG", "TINYPROXY_LOG", "HTTPPROXY_LOG")) reader.RetroKeys("PROXY_LOG", "TINYPROXY_LOG", "HTTPPROXY_LOG"),
reader.IsRetro(currentKey))
switch strings.ToLower(value) { switch strings.ToLower(value) {
case "": case "":
const currentKey = "HTTPPROXY_LOG"
return r.BoolPtr(currentKey) return r.BoolPtr(currentKey)
case "on", "info", "connect", "notice": case "on", "info", "connect", "notice":
return ptrTo(true), nil return ptrTo(true), nil