Merge pull request #1302 from ripienaar/ttl_fix

Fix for latest iteration of msg TTLs

Author: ripienaar

cli/pub_command.go

@@ -259,6 +259,8 @@ func (c *pubCmd) doJetstream(nc *nats.Conn, progress *progress.Tracker) error {
 
 		msg.Subject = string(subj)
 
+		log.Printf("Published %d bytes to %q\n", len(body), c.subject)
+
 		resp, err := nc.RequestMsg(msg, opts().Timeout)
 		if err != nil {
 			return err
@@ -276,14 +278,14 @@ func (c *pubCmd) doJetstream(nc *nats.Conn, progress *progress.Tracker) error {
 		if progress != nil {
 			progress.Increment(1)
 		} else {
-			fmt.Printf(">>> Stream: %s Sequence: %s", ack.Stream, f(ack.Sequence))
+			msg := fmt.Sprintf("Stored in Stream: %s Sequence: %s", ack.Stream, f(ack.Sequence))
 			if ack.Domain != "" {
-				fmt.Printf(" Domain: %q", ack.Domain)
+				msg += fmt.Sprintf(" Domain: %q", ack.Domain)
 			}
 			if ack.Duplicate {
-				fmt.Printf(" Duplicate: true")
+				msg += " Duplicate: true"
 			}
-			fmt.Println()
+			log.Printf(msg)
 		}
 
 		// If applicable, account for the wait duration in a publish sleep.

cli/stream_command.go

@@ -161,8 +161,6 @@ type streamCmd struct {
 	placementPreferred        string
 	allowMsgTTlSet            bool
 	allowMsgTTL               bool
-	subjectDeleteMarkersSet   bool
-	subjectDeleteMarkers      bool
 	subjectDeleteMarkerTTLSet bool
 	subjectDeleteMarkerTTL    time.Duration
 }
@@ -223,8 +221,7 @@ func configureStreamCommand(app commandHost) {
 		if !edit {
 			f.Flag("allow-msg-ttl", "Allows per-message TTL handling").IsSetByUser(&c.allowMsgTTlSet).UnNegatableBoolVar(&c.allowMsgTTL)
 		}
-		f.Flag("subject-del-markers", "Create subject delete markers").IsSetByUser(&c.subjectDeleteMarkersSet).BoolVar(&c.subjectDeleteMarkers)
-		f.Flag("subject-del-markers-ttl", "How long delete markers should persist in the Stream").IsSetByUser(&c.subjectDeleteMarkerTTLSet).DurationVar(&c.subjectDeleteMarkerTTL)
+		f.Flag("subject-del-markers-ttl", "How long delete markers should persist in the Stream").PlaceHolder("DURATION").IsSetByUser(&c.subjectDeleteMarkerTTLSet).DurationVar(&c.subjectDeleteMarkerTTL)
 		f.Flag("transform-source", "Stream subject transform source").PlaceHolder("SOURCE").StringVar(&c.subjectTransformSource)
 		f.Flag("transform-destination", "Stream subject transform destination").PlaceHolder("DEST").StringVar(&c.subjectTransformDest)
 		f.Flag("metadata", "Adds metadata to the stream").PlaceHolder("META").IsSetByUser(&c.metadataIsSet).StringMapVar(&c.metadata)