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

Code maintenance: Use Unset() option for params

Browse Source
This commit is contained in:
Quentin McGaw
2020-12-29 18:29:21 +00:00
parent a921f9848c
commit ef40f2f91b
4 changed files with 6 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
internal/params/shadowsocks.go
View File

@@ -35,13 +35,7 @@ func (r *reader) GetShadowSocksPort() (port uint16, err error) {
// GetShadowSocksPassword obtains the ShadowSocks server password from the environment variable
// SHADOWSOCKS_PASSWORD.
func (r *reader) GetShadowSocksPassword() (password string, err error) {
defer func() {
unsetErr := r.os.Unsetenv("SHADOWSOCKS_PASSWORD")
if err == nil {
err = unsetErr
}
}()
return r.envParams.GetEnv("SHADOWSOCKS_PASSWORD", libparams.CaseSensitiveValue())
return r.envParams.GetEnv("SHADOWSOCKS_PASSWORD", libparams.CaseSensitiveValue(), libparams.Unset())
}
// GetShadowSocksMethod obtains the ShadowSocks method to use from the environment variable