From 662c4fd22d6d6ed13d428baf5dba9b1cccfc8665 Mon Sep 17 00:00:00 2001 From: Neil Twigg Date: Tue, 30 Jul 2024 17:12:22 +0100 Subject: [PATCH] Change config option to `cluster_traffic` (takes `system` or `account`) Signed-off-by: Neil Twigg --- server/opts.go | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/server/opts.go b/server/opts.go index 7c77ad2e122..1f2e1c0258c 100644 --- a/server/opts.go +++ b/server/opts.go @@ -2128,12 +2128,19 @@ func parseJetStreamForAccount(v any, acc *Account, errors *[]error) error { return &configErr{tk, fmt.Sprintf("Expected a parseable size for %q, got %v", mk, mv)} } jsLimits.MaxAckPending = int(vv) - case "nrg_in_account": - vv, ok := mv.(bool) + case "cluster_traffic": + vv, ok := mv.(string) if !ok { - return &configErr{tk, fmt.Sprintf("Expected a boolean for %q, got %v", mk, mv)} + return &configErr{tk, fmt.Sprintf("Expected either 'system' or 'account' string value for %q, got %v", mk, mv)} + } + switch strings.ToLower(vv) { + case "system": + acc.js.accountNRG.Store(false) + case "account": + acc.js.accountNRG.Store(true) + default: + return &configErr{tk, fmt.Sprintf("Expected either 'system' or 'account' string value for %q, got %v", mk, mv)} } - acc.js.accountNRG.Store(vv) default: if !tk.IsUsedVariable() { err := &unknownConfigFieldErr{