gogrlx/nats-server
1
0
Fork 0
mirror of https://github.com/gogrlx/nats-server.git synced 2026-04-15 18:50:41 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2295 from ripienaar/2290.1

Browse Source 
further tagged error confusion cleanups
This commit is contained in:
R.I.Pienaar
2021-06-18 22:45:48 +02:00
committed by GitHub
parent 93a3720475 53ae604403
commit 77d54dabeb
4 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
server/errors.json
View File

@@ -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",

6
server/jetstream_api.go
View File

@@ -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

4
server/jetstream_errors_generated.go
View File

@@ -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}"},

2
server/stream.go
View File

@@ -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()