mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-01-13 06:47:28 -08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #629 from prometheus/improve-usage-formatting

Browse source 
Improve readability of usage text
This commit is contained in:
Tobias Schmidt 2015-04-08 17:51:29 -04:00
parent 2d7d1a34b6 7d71d354fd
commit 49d67fc834
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
main.go
View file

@ -92,7 +92,7 @@ type prometheus struct {
func NewPrometheus() *prometheus { func NewPrometheus() *prometheus {
conf, err := config.LoadFromFile(*configFile) conf, err := config.LoadFromFile(*configFile)
if err != nil { if err != nil {
glog.Errorf("Error loading configuration from %s: %v\n", *configFile, err) glog.Errorf("Couldn't load configuration (-config.file=%s): %v\n", *configFile, err)
os.Exit(2) os.Exit(2)
} }
@ -305,7 +305,7 @@ func usage() {
} }
sort.Sort(groupsOrdered) sort.Sort(groupsOrdered)
fmt.Fprintf(os.Stderr, "Usage: %s [options ...] -config.file=<config_file>:\n\n", os.Args[0]) fmt.Fprintf(os.Stderr, "Usage: %s [options ...]:\n\n", os.Args[0])
const ( const (
maxLineLength = 80 maxLineLength = 80
@ -317,15 +317,15 @@ func usage() {
} }
for _, fl := range groups[groupName] { for _, fl := range groups[groupName] {
format := " -%s=%s: " format := " -%s=%s"
if strings.Contains(fl.DefValue, " ") || fl.DefValue == "" { if strings.Contains(fl.DefValue, " ") || fl.DefValue == "" {
format = " -%s=%q: " format = " -%s=%q"
} }
flagUsage := fmt.Sprintf(format, fl.Name, fl.DefValue) flagUsage := fmt.Sprintf(format+lineSep, fl.Name, fl.DefValue)
// Format the usage text to not exceed maxLineLength characters per line. // Format the usage text to not exceed maxLineLength characters per line.
words := strings.SplitAfter(fl.Usage, " ") words := strings.SplitAfter(fl.Usage, " ")
lineLength := len(flagUsage) lineLength := len(lineSep) - 1
for _, w := range words { for _, w := range words {
if lineLength+len(w) > maxLineLength { if lineLength+len(w) > maxLineLength {
flagUsage += lineSep flagUsage += lineSep