Merge pull request #126 from nats-io/humanize

parse bytes when adding a stream and friendlier info

nats/bench_command.go

@@ -54,10 +54,7 @@ func (c *benchCmd) bench(_ *kingpin.ParseContext) error {
 		return fmt.Errorf("number of messages should be greater than 0")
 	}
 
-	log.Printf("Starting benchmark [msgs=%s, msgsize=%s, pubs=%d, subs=%d]\n", humanize.Comma(int64(c.numMsg)), humanize.IBytes(uint64(c.msgSize)), c.numPubs, c.numSubs)
-	if c.progress {
-		log.Print("Connections will flush after publish completed\n\n")
-	}
+	log.Printf("Starting benchmark [msgs=%s, msgsize=%s, pubs=%d, subs=%d]\n\n", humanize.Comma(int64(c.numMsg)), humanize.IBytes(uint64(c.msgSize)), c.numPubs, c.numSubs)
 
 	bm := bench.NewBenchmark("NATS", c.numSubs, c.numPubs)
 

nats/stream_command.go

@@ -452,11 +452,31 @@ func (c *streamCmd) showStreamConfig(cfg api.StreamConfig) {
 	fmt.Printf("     Acknowledgements: %v\n", !cfg.NoAck)
 	fmt.Printf("            Retention: %s - %s\n", cfg.Storage.String(), cfg.Retention.String())
 	fmt.Printf("             Replicas: %d\n", cfg.Replicas)
-	fmt.Printf("     Maximum Messages: %d\n", cfg.MaxMsgs)
-	fmt.Printf("        Maximum Bytes: %d\n", cfg.MaxBytes)
-	fmt.Printf("          Maximum Age: %s\n", cfg.MaxAge.String())
-	fmt.Printf(" Maximum Message Size: %d\n", cfg.MaxMsgSize)
-	fmt.Printf("    Maximum Consumers: %d\n", cfg.MaxConsumers)
+	if cfg.MaxMsgs == -1 {
+		fmt.Println("     Maximum Messages: unlimited")
+	} else {
+		fmt.Printf("     Maximum Messages: %s\n", humanize.Comma(cfg.MaxMsgs))
+	}
+	if cfg.MaxBytes == -1 {
+		fmt.Println("        Maximum Bytes: unlimited")
+	} else {
+		fmt.Printf("        Maximum Bytes: %s\n", humanize.IBytes(uint64(cfg.MaxBytes)))
+	}
+	if cfg.MaxAge == -1 {
+		fmt.Println("          Maximum Age: unlimited")
+	} else {
+		fmt.Printf("          Maximum Age: %s\n", cfg.MaxAge.String())
+	}
+	if cfg.MaxMsgSize == -1 {
+		fmt.Println(" Maximum Message Size: unlimited")
+	} else {
+		fmt.Printf(" Maximum Message Size: %s\n", humanize.IBytes(uint64(cfg.MaxMsgSize)))
+	}
+	if cfg.MaxConsumers == -1 {
+		fmt.Println("    Maximum Consumers: unlimited")
+	} else {
+		fmt.Printf("    Maximum Consumers: %d\n", cfg.MaxConsumers)
+	}
 	if cfg.Template != "" {
 		fmt.Printf("  Managed by Template: %s\n", cfg.Template)
 	}
@@ -616,7 +636,7 @@ func (c *streamCmd) prepareConfig() (cfg api.StreamConfig) {
 	}
 
 	if c.maxBytesLimit == 0 {
-		c.maxBytesLimit, err = askOneInt("Message size limit", "-1", "Defines the combined size of all messages in a Stream, when exceeded oldest messages are removed, -1 for unlimited. Settable using --max-bytes")
+		c.maxBytesLimit, err = askOneBytes("Message size limit", "-1", "Defines the combined size of all messages in a Stream, when exceeded oldest messages are removed, -1 for unlimited. Settable using --max-bytes")
 		kingpin.FatalIfError(err, "invalid input")
 	}
 

nats/util.go

@@ -24,6 +24,7 @@ import (
 	"unicode"
 
 	"github.com/AlecAivazis/survey/v2"
+	"github.com/dustin/go-humanize"
 	"github.com/nats-io/nats.go"
 
 	"github.com/nats-io/jsm.go"
@@ -209,13 +210,32 @@ func askConfirmation(prompt string, dflt bool) (bool, error) {
 	return ans, err
 }
 
+func askOneBytes(prompt string, dflt string, help string) (int64, error) {
+	val := ""
+	err := survey.AskOne(&survey.Input{
+		Message: prompt,
+		Default: dflt,
+		Help:    help,
+	}, &val, survey.WithValidator(survey.Required))
+	if err != nil {
+		return 0, err
+	}
+
+	i, err := humanize.ParseBytes(val)
+	if err != nil {
+		return 0, err
+	}
+
+	return int64(i), nil
+}
+
 func askOneInt(prompt string, dflt string, help string) (int64, error) {
 	val := ""
 	err := survey.AskOne(&survey.Input{
 		Message: prompt,
 		Default: dflt,
 		Help:    help,
-	}, &val)
+	}, &val, survey.WithValidator(survey.Required))
 	if err != nil {
 		return 0, err
 	}