mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2024-11-27 08:41:57 -06:00
Code Issues Packages Projects Releases Wiki Activity

Revert changes made to streams

Browse source
This commit is contained in:
Till Faelligen 2021-07-26 12:08:35 +02:00
parent 5f9996b1c5
commit a7ad4c182f
2 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
setup/jetstream/nats.go
View file

@ -74,6 +74,7 @@ func setupNATS(cfg *config.JetStream, nc *natsclient.Conn) (sarama.Consumer, sar
logrus.WithError(err).Fatal("Unable to get stream info") logrus.WithError(err).Fatal("Unable to get stream info")
} }
if info == nil { if info == nil {
stream.Subjects = []string{stream.Name}
// If we're trying to keep everything in memory (e.g. unit tests) // If we're trying to keep everything in memory (e.g. unit tests)
// then overwrite the storage policy. // then overwrite the storage policy.
if cfg.InMemory { if cfg.InMemory {

6
setup/jetstream/streams.go
View file

@ -18,38 +18,32 @@ var (
var streams = []*nats.StreamConfig{ var streams = []*nats.StreamConfig{
{ {
Name: OutputRoomEvent, Name: OutputRoomEvent,
Subjects: []string{OutputRoomEvent},
Retention: nats.InterestPolicy, Retention: nats.InterestPolicy,
Storage: nats.FileStorage, Storage: nats.FileStorage,
}, },
{ {
Name: OutputSendToDeviceEvent, Name: OutputSendToDeviceEvent,
Subjects: []string{OutputSendToDeviceEvent},
Retention: nats.InterestPolicy, Retention: nats.InterestPolicy,
Storage: nats.FileStorage, Storage: nats.FileStorage,
}, },
{ {
Name: OutputKeyChangeEvent, Name: OutputKeyChangeEvent,
Subjects: []string{OutputKeyChangeEvent},
Retention: nats.LimitsPolicy, Retention: nats.LimitsPolicy,
Storage: nats.FileStorage, Storage: nats.FileStorage,
}, },
{ {
Name: OutputTypingEvent, Name: OutputTypingEvent,
Subjects: []string{OutputTypingEvent},
Retention: nats.InterestPolicy, Retention: nats.InterestPolicy,
Storage: nats.MemoryStorage, Storage: nats.MemoryStorage,
MaxAge: time.Second * 60, MaxAge: time.Second * 60,
}, },
{ {
Name: OutputClientData, Name: OutputClientData,
Subjects: []string{OutputClientData},
Retention: nats.InterestPolicy, Retention: nats.InterestPolicy,
Storage: nats.FileStorage, Storage: nats.FileStorage,
}, },
{ {
Name: OutputReceiptEvent, Name: OutputReceiptEvent,
Subjects: []string{OutputReceiptEvent},
Retention: nats.InterestPolicy, Retention: nats.InterestPolicy,
Storage: nats.FileStorage, Storage: nats.FileStorage,
}, },