Merge pull request #28 from vitorarins/add-default-maxlen

minghsu0107 · web-flow · commit e8f0c328fc7a · 2024-04-26T14:31:12.000-07:00
diff --git a/Makefile b/Makefile
@@ -1,6 +1,9 @@
 up:
 	docker-compose up -d
 
+down:
+	docker-compose down
+
 test:
 	go test ./...
 
diff --git a/pkg/redisstream/publisher.go b/pkg/redisstream/publisher.go
@@ -40,9 +40,10 @@ func NewPublisher(config PublisherConfig, logger watermill.LoggerAdapter) (*Publ
 }
 
 type PublisherConfig struct {
-	Client     redis.UniversalClient
-	Marshaller Marshaller
-	Maxlens    map[string]int64
+	Client        redis.UniversalClient
+	Marshaller    Marshaller
+	Maxlens       map[string]int64
+	DefaultMaxlen int64
 }
 
 func (c *PublisherConfig) setDefaults() {
@@ -58,7 +59,7 @@ func (c *PublisherConfig) Validate() error {
 	for topic, maxlen := range c.Maxlens {
 		if maxlen < 0 {
 			// zero maxlen stream indicates unlimited stream length
-			c.Maxlens[topic] = 0
+			c.Maxlens[topic] = c.DefaultMaxlen
 		}
 	}
 	return nil
@@ -87,7 +88,7 @@ func (p *Publisher) Publish(topic string, msgs ...*message.Message) error {
 
 		maxlen, ok := p.config.Maxlens[topic]
 		if !ok {
-			maxlen = 0
+			maxlen = p.config.DefaultMaxlen
 		}
 
 		id, err := p.client.XAdd(context.Background(), &redis.XAddArgs{

Original file line number	Diff line number	Diff line change
`@@ -40,9 +40,10 @@ func NewPublisher(config PublisherConfig, logger watermill.LoggerAdapter) (*Publ`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`type PublisherConfig struct {`
`43`		`- Client redis.UniversalClient`
`44`		`- Marshaller Marshaller`
`45`		`- Maxlens map[string]int64`
	`43`	`+ Client redis.UniversalClient`
	`44`	`+ Marshaller Marshaller`
	`45`	`+ Maxlens map[string]int64`
	`46`	`+ DefaultMaxlen int64`
`46`	`47`	`}`
`47`	`48`
`48`	`49`	`func (c *PublisherConfig) setDefaults() {`
`@@ -58,7 +59,7 @@ func (c *PublisherConfig) Validate() error {`
`58`	`59`	`for topic, maxlen := range c.Maxlens {`
`59`	`60`	`if maxlen < 0 {`
`60`	`61`	`// zero maxlen stream indicates unlimited stream length`
`61`		`- c.Maxlens[topic] = 0`
	`62`	`+ c.Maxlens[topic] = c.DefaultMaxlen`
`62`	`63`	`}`
`63`	`64`	`}`
`64`	`65`	`return nil`
`@@ -87,7 +88,7 @@ func (p Publisher) Publish(topic string, msgs ...message.Message) error {`
`87`	`88`
`88`	`89`	`maxlen, ok := p.config.Maxlens[topic]`
`89`	`90`	`if !ok {`
`90`		`- maxlen = 0`
	`91`	`+ maxlen = p.config.DefaultMaxlen`
`91`	`92`	`}`
`92`	`93`
`93`	`94`	`id, err := p.client.XAdd(context.Background(), &redis.XAddArgs{`