resolve conflict

This commit is contained in:
Денис Евстигнеев 2024-12-19 13:36:55 +03:00 committed by devstigneev
parent 7c5da60556
commit 1ba02ed8ad
3 changed files with 6 additions and 8 deletions

View File

@ -10,7 +10,6 @@ linters:
- unused - unused
- gosimple - gosimple
- govet - govet
- goimports
- prealloc - prealloc
- unconvert - unconvert
- nakedret - nakedret

View File

@ -10,11 +10,10 @@ import (
type event struct { type event struct {
msg *broker.Message msg *broker.Message
err error err error
ctx context.Context
topic string topic string
ctx context.Context
sync.RWMutex sync.RWMutex
ack bool ack bool
} }

2
kgo.go
View File

@ -61,7 +61,7 @@ type Broker struct {
connected *atomic.Uint32 connected *atomic.Uint32
kopts []kgo.Opt kopts []kgo.Opt
subs []*subscriber subs []*Subscriber
opts broker.Options opts broker.Options