From 53ae60440330a68f5364229e0b6865f82230498b Mon Sep 17 00:00:00 2001 From: "R.I.Pienaar" Date: Fri, 18 Jun 2021 21:35:26 +0200 Subject: [PATCH] further tagged error confusion cleanups Signed-off-by: R.I.Pienaar --- server/errors.json | 3 ++- server/jetstream_api.go | 6 +++--- server/jetstream_errors_generated.go | 4 ++-- server/stream.go | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/server/errors.json b/server/errors.json index 7128b2b3..4e8c7329 100644 --- a/server/errors.json +++ b/server/errors.json @@ -446,7 +446,8 @@ "constant": "JSStreamGeneralErrorF", "code": 500, "error_code": 10051, - "description": "General stream failure string" + "description": "{err}", + "comment": "General stream failure string" }, { "constant": "JSStreamInvalidConfigF", diff --git a/server/jetstream_api.go b/server/jetstream_api.go index 174bcdfb..6aaeea4d 100644 --- a/server/jetstream_api.go +++ b/server/jetstream_api.go @@ -2205,7 +2205,7 @@ func (s *Server) jsStreamDeleteRequest(sub *subscription, c *client, subject, re } if err := mset.delete(); err != nil { - resp.Error = ApiErrors[JSStreamDeleteErrF].ErrOr(err) + resp.Error = ApiErrors[JSStreamDeleteErrF].ErrOrNewT(err, "{err}", err) s.sendAPIErrResponse(ci, acc, subject, reply, string(msg), s.jsonResponse(&resp)) return } @@ -2314,7 +2314,7 @@ func (s *Server) jsMsgDeleteRequest(sub *subscription, c *client, subject, reply removed, err = mset.eraseMsg(req.Seq) } if err != nil { - resp.Error = ApiErrors[JSStreamMsgDeleteFailedF].ErrOr(err) + resp.Error = ApiErrors[JSStreamMsgDeleteFailedF].ErrOrNewT(err, "{err}", err) } else if !removed { resp.Error = ApiErrors[JSSequenceNotFoundErrF].NewT("{seq}", req.Seq) } else { @@ -2519,7 +2519,7 @@ func (s *Server) jsStreamPurgeRequest(sub *subscription, c *client, subject, rep purged, err := mset.purge() if err != nil { - resp.Error = ApiErrors[JSStreamGeneralErrorF].ErrOr(err) + resp.Error = ApiErrors[JSStreamGeneralErrorF].ErrOrNewT(err, "{err}", err) } else { resp.Purged = purged resp.Success = true diff --git a/server/jetstream_errors_generated.go b/server/jetstream_errors_generated.go index fb23849b..8e9c2d30 100644 --- a/server/jetstream_errors_generated.go +++ b/server/jetstream_errors_generated.go @@ -153,7 +153,7 @@ const ( // JSStreamExternalDelPrefixOverlapsErrF stream external delivery prefix {prefix} overlaps with stream subject {subject} JSStreamExternalDelPrefixOverlapsErrF ErrorIdentifier = 10022 - // JSStreamGeneralErrorF General stream failure string + // JSStreamGeneralErrorF General stream failure string ({err}) JSStreamGeneralErrorF ErrorIdentifier = 10051 // JSStreamInvalidConfigF Stream configuration validation error string ({err}) @@ -281,7 +281,7 @@ var ( JSStreamDeleteErrF: {Code: 500, ErrCode: 10050, Description: "{err}"}, JSStreamExternalApiOverlapErrF: {Code: 400, ErrCode: 10021, Description: "stream external api prefix {prefix} must not overlap with {subject}"}, JSStreamExternalDelPrefixOverlapsErrF: {Code: 400, ErrCode: 10022, Description: "stream external delivery prefix {prefix} overlaps with stream subject {subject}"}, - JSStreamGeneralErrorF: {Code: 500, ErrCode: 10051, Description: "General stream failure string"}, + JSStreamGeneralErrorF: {Code: 500, ErrCode: 10051, Description: "{err}"}, JSStreamInvalidConfigF: {Code: 500, ErrCode: 10052, Description: "{err}"}, JSStreamInvalidExternalDeliverySubjErrF: {Code: 400, ErrCode: 10024, Description: "stream external delivery prefix {prefix} must not contain wildcards"}, JSStreamLimitsErrF: {Code: 500, ErrCode: 10053, Description: "{err}"}, diff --git a/server/stream.go b/server/stream.go index ccdbb420..13d94ad4 100644 --- a/server/stream.go +++ b/server/stream.go @@ -3281,7 +3281,7 @@ func (a *Account) RestoreStream(ncfg *StreamConfig, r io.Reader) (*stream, error cfg, err := checkStreamCfg(ncfg) if err != nil { - return nil, ApiErrors[JSStreamNotFoundErr].ErrOrNewT(err, "{err}", err) + return nil, ApiErrors[JSStreamNotFoundErr].ErrOr(err) } _, jsa, err := a.checkForJetStream()