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

Merge pull request #1410 from ripienaar/remove_advisory_config

Browse Source 
removes the configuration from advisories
This commit is contained in:
Derek Collison
2020-05-22 07:12:51 -07:00
committed by GitHub
parent 34faa65186 09dca63efe
commit 0e3c73192d
2 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/jetstream_events.go
View File

@@ -36,11 +36,9 @@ const (
// JSStreamActionAdvisory indicates that a stream was created, edited or deleted
type JSStreamActionAdvisory struct {
TypedEvent
Stream string `json:"stream"`
Action ActionAdvisoryType `json:"action"`
Template string `json:"template,omitempty"`
OriginalConfiguration *StreamConfig `json:"original,omitempty"`
NewConfiguration *StreamConfig `json:"new,omitempty"`
Stream string `json:"stream"`
Action ActionAdvisoryType `json:"action"`
Template string `json:"template,omitempty"`
}
const JSStreamActionAdvisoryType = "io.nats.jetstream.advisory.v1.stream_action"

10
server/stream.go
View File

@@ -225,7 +225,7 @@ func (mset *Stream) sendDeleteAdvisoryLocked() {
}
}
func (mset *Stream) sendUpdateAdvisoryLocked(old, new StreamConfig) {
func (mset *Stream) sendUpdateAdvisoryLocked() {
if mset.sendq == nil {
return
}
@@ -236,10 +236,8 @@ func (mset *Stream) sendUpdateAdvisoryLocked(old, new StreamConfig) {
ID: nuid.Next(),
Time: time.Now().UTC(),
},
Stream: mset.config.Name,
Action: ModifyEvent,
OriginalConfiguration: &old,
NewConfiguration: &new,
Stream: mset.config.Name,
Action: ModifyEvent,
}
j, err := json.MarshalIndent(m, "", " ")
@@ -436,7 +434,7 @@ func (mset *Stream) Update(config *StreamConfig) error {
mset.config = cfg
mset.store.UpdateConfig(&cfg)
mset.sendUpdateAdvisoryLocked(o_cfg, cfg)
mset.sendUpdateAdvisoryLocked()
return nil
}