From 8c6f67ef46f4de3c4bbff9f09bb583768839ec49 Mon Sep 17 00:00:00 2001 From: "R.I.Pienaar" Date: Thu, 31 Oct 2024 09:43:03 +0100 Subject: [PATCH] Report 2.11 strict encoding option and subs in account report Signed-off-by: R.I.Pienaar --- cli/account_command.go | 3 ++- cli/server_info_command.go | 1 + go.mod | 6 +++--- go.sum | 12 ++++++------ 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/cli/account_command.go b/cli/account_command.go index 9aa3c77b..7ce52112 100644 --- a/cli/account_command.go +++ b/cli/account_command.go @@ -235,7 +235,7 @@ func (c *actCmd) reportServerStats(_ *fisk.ParseContext) error { } table := newTableWriter("Server Statistics") - table.AddHeaders("Server", "Cluster", "Version", "Tags", "Connections", "Leafnodes", "Sent Bytes", "Sent Messages", "Received Bytes", "Received Messages", "Slow Consumers") + table.AddHeaders("Server", "Cluster", "Version", "Tags", "Connections", "Subscriptions", "Leafnodes", "Sent Bytes", "Sent Messages", "Received Bytes", "Received Messages", "Slow Consumers") var ( conn, ln int @@ -267,6 +267,7 @@ func (c *actCmd) reportServerStats(_ *fisk.ParseContext) error { sz.ServerInfo.Version, f(sz.ServerInfo.Tags), f(stats.Conns), + f(stats.NumSubs), f(stats.LeafNodes), humanize.IBytes(uint64(stats.Sent.Bytes)), f(stats.Sent.Msgs), diff --git a/cli/server_info_command.go b/cli/server_info_command.go index 46fc9e48..d10b872a 100644 --- a/cli/server_info_command.go +++ b/cli/server_info_command.go @@ -162,6 +162,7 @@ func (c *SrvInfoCmd) info(_ *fisk.ParseContext) error { cols.AddRow("Maximum Duplicate Window", js.Limits.Duplicates) } } + cols.AddRow("Strict API Parsing", js.Config.Strict) } cols.AddSectionTitle("Limits") diff --git a/go.mod b/go.mod index f4202ae9..1a40f203 100644 --- a/go.mod +++ b/go.mod @@ -18,11 +18,11 @@ require ( github.com/guptarohit/asciigraph v0.7.2 github.com/jedib0t/go-pretty/v6 v6.6.0 github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 - github.com/klauspost/compress v1.17.10 + github.com/klauspost/compress v1.17.11 github.com/mattn/go-isatty v0.0.20 github.com/nats-io/jsm.go v0.1.1-0.20241009102239-a4b8b81de28f - github.com/nats-io/jwt/v2 v2.7.0 - github.com/nats-io/nats-server/v2 v2.11.0-dev.0.20241004162106-225cd3dd6eca + github.com/nats-io/jwt/v2 v2.7.2 + github.com/nats-io/nats-server/v2 v2.11.0-dev.0.20241030181516-1ee2b8a11af8 github.com/nats-io/nats.go v1.37.0 github.com/nats-io/nkeys v0.4.7 github.com/nats-io/nuid v1.0.1 diff --git a/go.sum b/go.sum index 1728636a..803219b7 100644 --- a/go.sum +++ b/go.sum @@ -73,8 +73,8 @@ github.com/jedib0t/go-pretty/v6 v6.6.0/go.mod h1:zbn98qrYlh95FIhwwsbIip0LYpwSG8S github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes= github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs= github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8= -github.com/klauspost/compress v1.17.10 h1:oXAz+Vh0PMUvJczoi+flxpnBEPxoER1IaAnU/NMPtT0= -github.com/klauspost/compress v1.17.10/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0= +github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc= +github.com/klauspost/compress v1.17.11/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= @@ -108,10 +108,10 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/nats-io/jsm.go v0.1.1-0.20241009102239-a4b8b81de28f h1:o+BGow/ORiT5wVLbzTjJBkraMCLkN1UsOs1jgXhegBU= github.com/nats-io/jsm.go v0.1.1-0.20241009102239-a4b8b81de28f/go.mod h1:6+1QXVPxOPgzKcuLXKsUAn6xjBoXv0q5dBvDVbbe78Y= -github.com/nats-io/jwt/v2 v2.7.0 h1:J+ZnaaMGQi3xSB8iOhVM5ipiWCDrQvgEoitTwWFyOYw= -github.com/nats-io/jwt/v2 v2.7.0/go.mod h1:ZdWS1nZa6WMZfFwwgpEaqBV8EPGVgOTDHN/wTbz0Y5A= -github.com/nats-io/nats-server/v2 v2.11.0-dev.0.20241004162106-225cd3dd6eca h1:EcjPbDziop5sCVOpWOhUXTcQPAg1of3p+MgczwJubUo= -github.com/nats-io/nats-server/v2 v2.11.0-dev.0.20241004162106-225cd3dd6eca/go.mod h1:LkVD8QXFfIxYsQCn3r0NHJk48PIg2XY1RqVBDTQwYuU= +github.com/nats-io/jwt/v2 v2.7.2 h1:SCRjfDLJ2q8naXp8YlGJJS5/yj3wGSODFYVi4nnwVMw= +github.com/nats-io/jwt/v2 v2.7.2/go.mod h1:kB6QUmqHG6Wdrzj0KP2L+OX4xiTPBeV+NHVstFaATXU= +github.com/nats-io/nats-server/v2 v2.11.0-dev.0.20241030181516-1ee2b8a11af8 h1:XMoB88mOGh1u64NNvtBEfidj+rEewunIfLCdmrhsNmY= +github.com/nats-io/nats-server/v2 v2.11.0-dev.0.20241030181516-1ee2b8a11af8/go.mod h1:VY1OpHND54C9/rK09yrZt7raHmTUioMOKPqJvRD3GDw= github.com/nats-io/nats.go v1.37.0 h1:07rauXbVnnJvv1gfIyghFEo6lUcYRY0WXc3x7x0vUxE= github.com/nats-io/nats.go v1.37.0/go.mod h1:Ubdu4Nh9exXdSz0RVWRFBbRfrbSxOYd26oF0wkWclB8= github.com/nats-io/nkeys v0.4.7 h1:RwNJbbIdYCoClSDNY7QVKZlyb/wfT6ugvFCiKy6vDvI=