Bläddra i källkod

docs(server/config.go): minor formatting changes

When -version or -help are given, don't warn about having to derive
the data directory name.
Print warnings about deprecated options on separate lines so the log
isn't screwy.
Andy Bakun 12 år sedan
förälder
incheckning
af3240fa18
1 ändrade filer med 2 tillägg och 2 borttagningar
  1. 2 2
      server/config.go

+ 2 - 2
server/config.go

@@ -277,7 +277,7 @@ func (c *Config) LoadFlags(arguments []string) error {
 	// Print deprecation warnings on STDERR.
 	f.Visit(func(f *flag.Flag) {
 		if len(newFlagNameLookup[f.Name]) > 0 {
-			fmt.Fprintf(os.Stderr, "[deprecated] use -%s, not -%s", newFlagNameLookup[f.Name], f.Name)
+			fmt.Fprintf(os.Stderr, "[deprecated] use -%s, not -%s\n", newFlagNameLookup[f.Name], f.Name)
 		}
 	})
 
@@ -416,7 +416,7 @@ func (c *Config) Sanitize() error {
 		c.NameFromHostname()
 	}
 
-	if c.DataDir == "" && c.Name != "" {
+	if c.DataDir == "" && c.Name != "" && !c.ShowVersion && !c.ShowHelp {
 		c.DataDirFromName()
 	}