Merge pull request #980 from ripienaar/conn_open_default

Default to open not all for connections
nats-io · Jan 30, 2024 · 4eed487 · 4eed487
2 parents ed7b2ee + 58cf3e1
commit 4eed487
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/cli/server_report_command.go b/cli/server_report_command.go
@@ -749,6 +749,13 @@ func (c *SrvReportCmd) getConnz(limit int, nc *nats.Conn) (connzList, error) {
 	var err error
 	env := map[string]any{}
 
+	if c.waitFor == 0 {
+		c.waitFor, err = currentActiveServers(nc)
+		if err != nil {
+			return nil, err
+		}
+	}
+
 	switch {
 	case c.filterReason != "" && c.filterExpression != "":
 		return nil, fmt.Errorf("cannot filter for closed reason and use a filter expression at the same time")
@@ -796,12 +803,12 @@ func (c *SrvReportCmd) getConnz(limit int, nc *nats.Conn) (connzList, error) {
 
 	state := server.ConnOpen
 	switch c.stateFilter {
-	case "open":
-		state = server.ConnOpen
+	case "all":
+		state = server.ConnAll
 	case "closed":
 		state = server.ConnClosed
 	default:
-		state = server.ConnAll
+		state = server.ConnOpen
 	}
 
 	req := &server.ConnzEventOptions{

diff --git a/cli/server_request_command.go b/cli/server_request_command.go
@@ -442,12 +442,12 @@ func (c *SrvRequestCmd) conns(_ *fisk.ParseContext) error {
 	}
 
 	switch c.stateFilter {
-	case "open":
-		opts.State = server.ConnOpen
+	case "all":
+		opts.State = server.ConnAll
 	case "closed":
 		opts.State = server.ConnClosed
 	default:
-		opts.State = server.ConnAll
+		opts.State = server.ConnOpen
 	}
 
 	nc, _, err := prepareHelper("", natsOpts()...)