SHADOWSOCKS_METHOD environment variable (#117)
This commit is contained in:
@@ -13,15 +13,23 @@ type ShadowSocks struct {
|
||||
Password string
|
||||
Log bool
|
||||
Port uint16
|
||||
Method string
|
||||
}
|
||||
|
||||
func (s *ShadowSocks) String() string {
|
||||
if !s.Enabled {
|
||||
return "ShadowSocks settings: disabled"
|
||||
}
|
||||
log := "disabled"
|
||||
if s.Log {
|
||||
log = "enabled"
|
||||
}
|
||||
settingsList := []string{
|
||||
"ShadowSocks settings:",
|
||||
"Password: [redacted]",
|
||||
"Log: " + log,
|
||||
fmt.Sprintf("Port: %d", s.Port),
|
||||
"Method: " + s.Method,
|
||||
}
|
||||
return strings.Join(settingsList, "\n |--")
|
||||
}
|
||||
@@ -44,5 +52,9 @@ func GetShadowSocksSettings(params params.ParamsReader) (settings ShadowSocks, e
|
||||
if err != nil {
|
||||
return settings, err
|
||||
}
|
||||
settings.Method, err = params.GetShadowSocksMethod()
|
||||
if err != nil {
|
||||
return settings, err
|
||||
}
|
||||
return settings, nil
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user