Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make Acknowledgment spelling consistent #657

Merged
merged 2 commits into from
Dec 21, 2022
Merged

Make Acknowledgment spelling consistent #657

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9a73d0c
Fix typo in Consumer State
Jarema Dec 20, 2022
2da8eca
Make Ack spelling consistent
Jarema Dec 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions cli/consumer_command.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ func configureConsumerCommand(app commandHost) {

addCreateFlags := func(f *fisk.CmdClause, edit bool) {
if !edit {
f.Flag("ack", "Acknowledgement policy (none, all, explicit)").StringVar(&c.ackPolicy)
f.Flag("ack", "Acknowledgment policy (none, all, explicit)").StringVar(&c.ackPolicy)
f.Flag("bps", "Restrict message delivery to a certain bit per second").Default("0").Uint64Var(&c.bpsRateLimit)
}
f.Flag("backoff", "Creates a consumer backoff policy using a specific pre-written algorithm (none, linear)").PlaceHolder("MODE").EnumVar(&c.backoffMode, "linear", "none")
Expand Down Expand Up @@ -132,7 +132,7 @@ func configureConsumerCommand(app commandHost) {
}
f.Flag("sample", "Percentage of requests to sample for monitoring purposes").Default("-1").IntVar(&c.samplePct)
f.Flag("target", "Push based delivery target subject").PlaceHolder("SUBJECT").StringVar(&c.delivery)
f.Flag("wait", "Acknowledgement waiting time").Default("-1s").DurationVar(&c.ackWait)
f.Flag("wait", "Acknowledgment waiting time").Default("-1s").DurationVar(&c.ackWait)
if !edit {
f.Flag("inactive-threshold", "How long to allow an ephemeral consumer to be idle before removing it").PlaceHolder("THRESHOLD").DurationVar(&c.inactiveThreshold)
f.Flag("memory", "Force the consumer state to be stored in memory rather than inherit from the stream").UnNegatableBoolVar(&c.memory)
Expand Down Expand Up @@ -1029,7 +1029,7 @@ func (c *consumerCmd) prepareConfig(pc *fisk.ParseContext) (cfg *api.ConsumerCon
}

err = askOne(&survey.Select{
Message: "Acknowledgement policy",
Message: "Acknowledgment policy",
Options: valid,
Default: dflt,
Help: "Messages that are not acknowledged will be redelivered at a later time. 'none' means no acknowledgement is needed only 1 delivery ever, 'all' means acknowledging message 10 will also acknowledge 0-9 and 'explicit' means each has to be acknowledged specifically. Settable using --ack",
Expand Down Expand Up @@ -1110,7 +1110,7 @@ func (c *consumerCmd) prepareConfig(pc *fisk.ParseContext) (cfg *api.ConsumerCon

if c.maxAckPending == -1 && cfg.AckPolicy != api.AckNone {
err = askOne(&survey.Input{
Message: "Maximum Acknowledgements Pending",
Message: "Maximum Acknowledgments Pending",
Default: "0",
Help: "The maximum number of messages without acknowledgement that can be outstanding, once this limit is reached message delivery will be suspended. Settable using --max-pending.",
}, &c.maxAckPending)
Expand Down
2 changes: 1 addition & 1 deletion cli/stream_command.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1500,7 +1500,7 @@ func (c *streamCmd) showStreamConfig(cfg api.StreamConfig) {
fmt.Println()

fmt.Printf(" Retention: %s\n", cfg.Retention.String())
fmt.Printf(" Acknowledgements: %v\n", !cfg.NoAck)
fmt.Printf(" Acknowledgments: %v\n", !cfg.NoAck)
dnp := cfg.Discard.String()
if cfg.DiscardNewPer {
dnp = "New Per Subject"
Expand Down