Rename to uncensored-send
This commit is contained in:
@@ -35,7 +35,7 @@ type Config struct {
|
||||
trustedProxyNets []*net.IPNet
|
||||
}
|
||||
|
||||
const EnvPrefix = "SEND_"
|
||||
const EnvPrefix = "UNCENSORED_SEND_"
|
||||
|
||||
// Register wires every option onto s. Short forms exist only for the options
|
||||
// reached often; everything else is long-only, by design.
|
||||
|
||||
@@ -86,7 +86,7 @@ func TestFormatRoundTrips(t *testing.T) {
|
||||
func TestHyphenConvention(t *testing.T) {
|
||||
newSet := func() (*Set, *string) {
|
||||
var listen string
|
||||
s := NewSet("test", "SEND_TEST_")
|
||||
s := NewSet("test", "UNCENSORED_SEND_TEST_")
|
||||
s.String(&listen, "listen", "l", "default", "ADDR", "listen address")
|
||||
return s, &listen
|
||||
}
|
||||
@@ -116,9 +116,9 @@ func TestHyphenConvention(t *testing.T) {
|
||||
}
|
||||
|
||||
func TestEnvFallback(t *testing.T) {
|
||||
t.Setenv("SEND_TEST_MAX_SIZE", "4GiB")
|
||||
t.Setenv("UNCENSORED_SEND_TEST_MAX_SIZE", "4GiB")
|
||||
var size int64
|
||||
s := NewSet("test", "SEND_TEST_")
|
||||
s := NewSet("test", "UNCENSORED_SEND_TEST_")
|
||||
s.Size(&size, "max-size", "s", "2GiB", "cap")
|
||||
if err := s.Parse(nil); err != nil {
|
||||
t.Fatal(err)
|
||||
@@ -128,7 +128,7 @@ func TestEnvFallback(t *testing.T) {
|
||||
}
|
||||
|
||||
// An explicit flag still wins over the environment.
|
||||
s = NewSet("test", "SEND_TEST_")
|
||||
s = NewSet("test", "UNCENSORED_SEND_TEST_")
|
||||
s.Size(&size, "max-size", "s", "2GiB", "cap")
|
||||
if err := s.Parse([]string{"--max-size", "1GiB"}); err != nil {
|
||||
t.Fatal(err)
|
||||
|
||||
@@ -52,7 +52,7 @@ func (s *Set) note(long, short string) {
|
||||
}
|
||||
}
|
||||
|
||||
// envName maps --max-size to SEND_MAX_SIZE.
|
||||
// envName maps --max-size to UNCENSORED_SEND_MAX_SIZE.
|
||||
func (s *Set) envName(long string) string {
|
||||
return s.envPrefix + strings.ToUpper(strings.ReplaceAll(long, "-", "_"))
|
||||
}
|
||||
@@ -183,7 +183,7 @@ func (s *Set) checkConvention(args []string) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
// applyEnv seeds every option from its SEND_-prefixed environment variable.
|
||||
// applyEnv seeds every option from its UNCENSORED_SEND_-prefixed environment variable.
|
||||
// Called before parsing so an explicit command-line flag always wins.
|
||||
func (s *Set) applyEnv() error {
|
||||
for _, sp := range s.specs {
|
||||
@@ -214,7 +214,7 @@ func (s *Set) Parse(args []string) error {
|
||||
// Changed reports whether an option was given on the command line.
|
||||
//
|
||||
// Values picked up from the environment do not count: a command that acts only
|
||||
// on the options you actually typed must not quietly act on a SEND_ variable
|
||||
// on the options you actually typed must not quietly act on a UNCENSORED_SEND_ variable
|
||||
// exported for the server.
|
||||
func (s *Set) Changed(long string) bool {
|
||||
if s.fromEnv[long] {
|
||||
|
||||
Reference in New Issue
Block a user