gogrlx/nats-server
1
0
Fork 0
mirror of https://github.com/gogrlx/nats-server.git synced 2026-04-02 11:48:43 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2293 from nats-io/err_templ

Browse Source 
Fix for #2290
This commit is contained in:
Derek Collison
2021-06-18 07:26:46 -07:00
committed by GitHub
parent 9f6ba90d3e c75d97a0d3
commit 6ccbd97ce0
2 changed files with 42 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
server/jetstream_api.go
View File

@@ -935,7 +935,7 @@ func (s *Server) jsTemplateCreateRequest(sub *subscription, c *client, subject,
t, err := acc.addStreamTemplate(&cfg)
if err != nil {
resp.Error = ApiErrors[JSStreamTemplateCreateErrF].ErrOr(err)
resp.Error = ApiErrors[JSStreamTemplateCreateErrF].ErrOrNewT(err, "{err}", err)
s.sendAPIErrResponse(ci, acc, subject, reply, string(msg), s.jsonResponse(&resp))
return
}
@@ -1080,7 +1080,7 @@ func (s *Server) jsTemplateDeleteRequest(sub *subscription, c *client, subject,
name := templateNameFromSubject(subject)
err = acc.deleteStreamTemplate(name)
if err != nil {
resp.Error = ApiErrors[JSStreamTemplateDeleteErrF].ErrOr(err)
resp.Error = ApiErrors[JSStreamTemplateDeleteErrF].ErrOrNewT(err, "{err}", err)
s.sendAPIErrResponse(ci, acc, subject, reply, string(msg), s.jsonResponse(&resp))
return
}
@@ -1351,13 +1351,13 @@ func (s *Server) jsStreamUpdateRequest(sub *subscription, c *client, subject, re
mset, err := acc.lookupStream(streamName)
if err != nil {
resp.Error = ApiErrors[JSStreamNotFoundErr].ErrOr(err)
resp.Error = ApiErrors[JSStreamNotFoundErr].ErrOrNewT(err, "{err}", err)
s.sendAPIErrResponse(ci, acc, subject, reply, string(msg), s.jsonResponse(&resp))
return
}
if err := mset.update(&cfg); err != nil {
resp.Error = ApiErrors[JSStreamUpdateErrF].ErrOr(err)
resp.Error = ApiErrors[JSStreamUpdateErrF].ErrOrNewT(err, "{err}", err)
s.sendAPIErrResponse(ci, acc, subject, reply, string(msg), s.jsonResponse(&resp))
return
}
@@ -2120,7 +2120,7 @@ func (s *Server) jsLeaderStepDownRequest(sub *subscription, c *client, subject,
// Call actual stepdown.
err = cc.meta.StepDown(preferredLeader)
if err != nil {
resp.Error = ApiErrors[JSRaftGeneralErrF].ErrOr(err)
resp.Error = ApiErrors[JSRaftGeneralErrF].ErrOrNewT(err, "{err}", err)
} else {
resp.Success = true
}
@@ -2199,13 +2199,13 @@ func (s *Server) jsStreamDeleteRequest(sub *subscription, c *client, subject, re
mset, err := acc.lookupStream(stream)
if err != nil {
resp.Error = ApiErrors[JSStreamNotFoundErr].ErrOr(err)
resp.Error = ApiErrors[JSStreamNotFoundErr].ErrOrNewT(err, "{err}", err)
s.sendAPIErrResponse(ci, acc, subject, reply, string(msg), s.jsonResponse(&resp))
return
}
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
}
@@ -2856,7 +2856,7 @@ func (s *Server) jsStreamSnapshotRequest(sub *subscription, c *client, subject,
sr, err := mset.snapshot(0, req.CheckMsgs, !req.NoConsumers)
if err != nil {
s.Warnf("Snapshot of stream '%s > %s' failed: %v", mset.jsa.account.Name, mset.name(), err)
resp.Error = ApiErrors[JSStreamSnapshotErrF].ErrOr(err)
resp.Error = ApiErrors[JSStreamSnapshotErrF].ErrOrNewT(err, "{err}", err)
s.sendAPIErrResponse(ci, acc, subject, reply, smsg, s.jsonResponse(&resp))
return
}
@@ -3101,14 +3101,14 @@ func (s *Server) jsConsumerCreate(sub *subscription, c *client, subject, reply s
stream, err := acc.lookupStream(req.Stream)
if err != nil {
resp.Error = ApiErrors[JSStreamNotFoundErr].ErrOr(err)
resp.Error = ApiErrors[JSStreamNotFoundErr].ErrOrNewT(err, "{err}", err)
s.sendAPIErrResponse(ci, acc, subject, reply, string(msg), s.jsonResponse(&resp))
return
}
o, err := stream.addConsumer(&req.Config)
if err != nil {
resp.Error = ApiErrors[JSConsumerCreateErrF].ErrOr(err)
resp.Error = ApiErrors[JSConsumerCreateErrF].ErrOrNewT(err, "{err}", err)
s.sendAPIErrResponse(ci, acc, subject, reply, string(msg), s.jsonResponse(&resp))
return
}
@@ -3208,7 +3208,7 @@ func (s *Server) jsConsumerNamesRequest(sub *subscription, c *client, subject, r
} else {
mset, err := acc.lookupStream(streamName)
if err != nil {
resp.Error = ApiErrors[JSStreamNotFoundErr].ErrOr(err)
resp.Error = ApiErrors[JSStreamNotFoundErr].ErrOrNewT(err, "{err}", err)
s.sendAPIErrResponse(ci, acc, subject, reply, string(msg), s.jsonResponse(&resp))
return
}
@@ -3302,7 +3302,7 @@ func (s *Server) jsConsumerListRequest(sub *subscription, c *client, subject, re
mset, err := acc.lookupStream(streamName)
if err != nil {
resp.Error = ApiErrors[JSStreamNotFoundErr].ErrOr(err)
resp.Error = ApiErrors[JSStreamNotFoundErr].ErrOrNewT(err, "{err}", err)
s.sendAPIErrResponse(ci, acc, subject, reply, string(msg), s.jsonResponse(&resp))
return
}
@@ -3425,7 +3425,7 @@ func (s *Server) jsConsumerInfoRequest(sub *subscription, c *client, subject, re
mset, err := acc.lookupStream(streamName)
if err != nil {
resp.Error = ApiErrors[JSStreamNotFoundErr].ErrOr(err)
resp.Error = ApiErrors[JSStreamNotFoundErr].ErrOrNewT(err, "{err}", err)
s.sendAPIErrResponse(ci, acc, subject, reply, string(msg), s.jsonResponse(&resp))
return
}
@@ -3492,7 +3492,7 @@ func (s *Server) jsConsumerDeleteRequest(sub *subscription, c *client, subject,
mset, err := acc.lookupStream(stream)
if err != nil {
resp.Error = ApiErrors[JSStreamNotFoundErr].ErrOr(err)
resp.Error = ApiErrors[JSStreamNotFoundErr].ErrOrNewT(err, "{err}", err)
s.sendAPIErrResponse(ci, acc, subject, reply, string(msg), s.jsonResponse(&resp))
return
}
@@ -3504,7 +3504,7 @@ func (s *Server) jsConsumerDeleteRequest(sub *subscription, c *client, subject,
return
}
if err := obs.delete(); err != nil {
resp.Error = ApiErrors[JSStreamGeneralErrorF].ErrOr(err)
resp.Error = ApiErrors[JSStreamGeneralErrorF].ErrOrNewT(err, "{err}", err)
s.sendAPIErrResponse(ci, acc, subject, reply, string(msg), s.jsonResponse(&resp))
return
}

27
server/jetstream_test.go
View File

@@ -11513,6 +11513,33 @@ func TestJetStreamDirectConsumersBeingReported(t *testing.T) {
}
}
// https://github.com/nats-io/nats-server/issues/2290
func TestJetStreamTemplatedErrorsBug(t *testing.T) {
s := RunBasicJetStreamServer()
defer s.Shutdown()
if config := s.JetStreamConfig(); config != nil {
defer removeDir(t, config.StoreDir)
}
// Client for API requests.
nc, js := jsClientConnect(t, s)
defer nc.Close()
_, err := js.AddStream(&nats.StreamConfig{
Name: "TEST",
Subjects: []string{"foo"},
})
if err != nil {
t.Fatalf("Unexpected error: %v", err)
}
_, err = js.PullSubscribe("foo", "")
if err != nil && strings.Contains(err.Error(), "{err}") {
t.Fatalf("Error is not filled in: %v", err)
}
}
///////////////////////////////////////////////////////////////////////////
// Simple JetStream Benchmarks
///////////////////////////////////////////////////////////////////////////