fix: events
This commit is contained in:
64
templates/project/providers/event/config.go.tpl
Normal file
64
templates/project/providers/event/config.go.tpl
Normal file
@@ -0,0 +1,64 @@
|
||||
package event
|
||||
|
||||
import (
|
||||
"context"
|
||||
|
||||
"git.ipao.vip/rogeecn/atom/container"
|
||||
"git.ipao.vip/rogeecn/atom/utils/opt"
|
||||
"github.com/ThreeDotsLabs/watermill"
|
||||
"github.com/ThreeDotsLabs/watermill/message"
|
||||
)
|
||||
|
||||
const DefaultPrefix = "Events"
|
||||
|
||||
func DefaultProvider() container.ProviderContainer {
|
||||
return container.ProviderContainer{
|
||||
Provider: Provide,
|
||||
Options: []opt.Option{
|
||||
opt.Prefix(DefaultPrefix),
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
type Config struct {
|
||||
ConsumerGroup string
|
||||
|
||||
Brokers []string
|
||||
}
|
||||
|
||||
type PubSub struct {
|
||||
Publisher message.Publisher
|
||||
Subscriber message.Subscriber
|
||||
Router *message.Router
|
||||
}
|
||||
|
||||
func (ps *PubSub) Serve(ctx context.Context) error {
|
||||
if err := ps.Router.Run(ctx); err != nil {
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (ps *PubSub) Handle(
|
||||
handlerName string,
|
||||
consumerTopic string,
|
||||
publisherTopic string,
|
||||
handler message.HandlerFunc,
|
||||
) {
|
||||
ps.Router.AddHandler(handlerName, consumerTopic, ps.Subscriber, publisherTopic, ps.Publisher, handler)
|
||||
}
|
||||
|
||||
// publish
|
||||
func (ps *PubSub) Publish(e contracts.EventPublisher) error {
|
||||
if e == nil {
|
||||
return nil
|
||||
}
|
||||
|
||||
payload, err := e.Marshal()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
msg := message.NewMessage(watermill.NewUUID(), payload)
|
||||
return ps.Publisher.Publish(e.Topic(), msg)
|
||||
}
|
||||
60
templates/project/providers/event/logrus_adapter.go.tpl
Normal file
60
templates/project/providers/event/logrus_adapter.go.tpl
Normal file
@@ -0,0 +1,60 @@
|
||||
package event
|
||||
|
||||
import (
|
||||
"github.com/ThreeDotsLabs/watermill"
|
||||
"github.com/sirupsen/logrus"
|
||||
)
|
||||
|
||||
// LogrusLoggerAdapter is a watermill logger adapter for logrus.
|
||||
type LogrusLoggerAdapter struct {
|
||||
log *logrus.Logger
|
||||
fields watermill.LogFields
|
||||
}
|
||||
|
||||
// NewLogrusLogger returns a LogrusLoggerAdapter that sends all logs to
|
||||
// the passed logrus instance.
|
||||
func LogrusAdapter() watermill.LoggerAdapter {
|
||||
return &LogrusLoggerAdapter{log: logrus.StandardLogger()}
|
||||
}
|
||||
|
||||
// Error logs on level error with err as field and optional fields.
|
||||
func (l *LogrusLoggerAdapter) Error(msg string, err error, fields watermill.LogFields) {
|
||||
l.createEntry(fields.Add(watermill.LogFields{"err": err})).Error(msg)
|
||||
}
|
||||
|
||||
// Info logs on level info with optional fields.
|
||||
func (l *LogrusLoggerAdapter) Info(msg string, fields watermill.LogFields) {
|
||||
l.createEntry(fields).Info(msg)
|
||||
}
|
||||
|
||||
// Debug logs on level debug with optional fields.
|
||||
func (l *LogrusLoggerAdapter) Debug(msg string, fields watermill.LogFields) {
|
||||
l.createEntry(fields).Debug(msg)
|
||||
}
|
||||
|
||||
// Trace logs on level trace with optional fields.
|
||||
func (l *LogrusLoggerAdapter) Trace(msg string, fields watermill.LogFields) {
|
||||
l.createEntry(fields).Trace(msg)
|
||||
}
|
||||
|
||||
// With returns a new LogrusLoggerAdapter that includes fields
|
||||
// to be re-used between logging statements.
|
||||
func (l *LogrusLoggerAdapter) With(fields watermill.LogFields) watermill.LoggerAdapter {
|
||||
return &LogrusLoggerAdapter{
|
||||
log: l.log,
|
||||
fields: l.fields.Add(fields),
|
||||
}
|
||||
}
|
||||
|
||||
// createEntry is a helper to add fields to a logrus entry if necessary.
|
||||
func (l *LogrusLoggerAdapter) createEntry(fields watermill.LogFields) *logrus.Entry {
|
||||
entry := logrus.NewEntry(l.log)
|
||||
|
||||
allFields := fields.Add(l.fields)
|
||||
|
||||
if len(allFields) > 0 {
|
||||
entry = entry.WithFields(logrus.Fields(allFields))
|
||||
}
|
||||
|
||||
return entry
|
||||
}
|
||||
32
templates/project/providers/event/provider.go.tpl
Normal file
32
templates/project/providers/event/provider.go.tpl
Normal file
@@ -0,0 +1,32 @@
|
||||
package event
|
||||
|
||||
import (
|
||||
"git.ipao.vip/rogeecn/atom/container"
|
||||
"git.ipao.vip/rogeecn/atom/utils/opt"
|
||||
"github.com/ThreeDotsLabs/watermill/message"
|
||||
"github.com/ThreeDotsLabs/watermill/pubsub/gochannel"
|
||||
)
|
||||
|
||||
func Provide(opts ...opt.Option) error {
|
||||
o := opt.New(opts...)
|
||||
var config Config
|
||||
if err := o.UnmarshalConfig(&config); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return container.Container.Provide(func() (*PubSub, error) {
|
||||
logger := LogrusAdapter()
|
||||
|
||||
client := gochannel.NewGoChannel(gochannel.Config{}, logger)
|
||||
router, err := message.NewRouter(message.RouterConfig{}, logger)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return &PubSub{
|
||||
Publisher: client,
|
||||
Subscriber: client,
|
||||
Router: router,
|
||||
}, nil
|
||||
}, o.DiOptions()...)
|
||||
}
|
||||
48
templates/project/providers/event/provider_kafka.go.tpl
Normal file
48
templates/project/providers/event/provider_kafka.go.tpl
Normal file
@@ -0,0 +1,48 @@
|
||||
package event
|
||||
|
||||
import (
|
||||
"git.ipao.vip/rogeecn/atom/container"
|
||||
"git.ipao.vip/rogeecn/atom/utils/opt"
|
||||
"github.com/ThreeDotsLabs/watermill-kafka/v3/pkg/kafka"
|
||||
"github.com/ThreeDotsLabs/watermill/message"
|
||||
)
|
||||
|
||||
func ProvideKafka(opts ...opt.Option) error {
|
||||
o := opt.New(opts...)
|
||||
var config Config
|
||||
if err := o.UnmarshalConfig(&config); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return container.Container.Provide(func() (*PubSub, error) {
|
||||
logger := LogrusAdapter()
|
||||
|
||||
publisher, err := kafka.NewPublisher(kafka.PublisherConfig{
|
||||
Brokers: config.Brokers,
|
||||
Marshaler: kafka.DefaultMarshaler{},
|
||||
}, logger)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
subscriber, err := kafka.NewSubscriber(kafka.SubscriberConfig{
|
||||
Brokers: config.Brokers,
|
||||
Unmarshaler: kafka.DefaultMarshaler{},
|
||||
ConsumerGroup: config.ConsumerGroup,
|
||||
}, logger)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
router, err := message.NewRouter(message.RouterConfig{}, logger)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return &PubSub{
|
||||
Publisher: publisher,
|
||||
Subscriber: subscriber,
|
||||
Router: router,
|
||||
}, nil
|
||||
}, o.DiOptions()...)
|
||||
}
|
||||
49
templates/project/providers/event/provider_redis.go.tpl
Normal file
49
templates/project/providers/event/provider_redis.go.tpl
Normal file
@@ -0,0 +1,49 @@
|
||||
package event
|
||||
|
||||
import (
|
||||
"git.ipao.vip/rogeecn/atom/container"
|
||||
"git.ipao.vip/rogeecn/atom/utils/opt"
|
||||
"github.com/ThreeDotsLabs/watermill-redisstream/pkg/redisstream"
|
||||
"github.com/ThreeDotsLabs/watermill/message"
|
||||
"github.com/redis/go-redis/v9"
|
||||
)
|
||||
|
||||
func ProvideRedis(opts ...opt.Option) error {
|
||||
o := opt.New(opts...)
|
||||
var config Config
|
||||
if err := o.UnmarshalConfig(&config); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return container.Container.Provide(func(rdb redis.UniversalClient) (*PubSub, error) {
|
||||
logger := LogrusAdapter()
|
||||
|
||||
subscriber, err := redisstream.NewSubscriber(redisstream.SubscriberConfig{
|
||||
Client: rdb,
|
||||
Unmarshaller: redisstream.DefaultMarshallerUnmarshaller{},
|
||||
ConsumerGroup: config.ConsumerGroup,
|
||||
}, logger)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
publisher, err := redisstream.NewPublisher(redisstream.PublisherConfig{
|
||||
Client: rdb,
|
||||
Marshaller: redisstream.DefaultMarshallerUnmarshaller{},
|
||||
}, logger)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
router, err := message.NewRouter(message.RouterConfig{}, logger)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return &PubSub{
|
||||
Publisher: publisher,
|
||||
Subscriber: subscriber,
|
||||
Router: router,
|
||||
}, nil
|
||||
}, o.DiOptions()...)
|
||||
}
|
||||
49
templates/project/providers/event/provider_sql.go.tpl
Normal file
49
templates/project/providers/event/provider_sql.go.tpl
Normal file
@@ -0,0 +1,49 @@
|
||||
package event
|
||||
|
||||
import (
|
||||
sqlDB "database/sql"
|
||||
|
||||
"git.ipao.vip/rogeecn/atom/container"
|
||||
"git.ipao.vip/rogeecn/atom/utils/opt"
|
||||
"github.com/ThreeDotsLabs/watermill-sql/v3/pkg/sql"
|
||||
"github.com/ThreeDotsLabs/watermill/message"
|
||||
)
|
||||
|
||||
func ProvideSQL(opts ...opt.Option) error {
|
||||
o := opt.New(opts...)
|
||||
var config Config
|
||||
if err := o.UnmarshalConfig(&config); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return container.Container.Provide(func(db *sqlDB.DB) (*PubSub, error) {
|
||||
logger := LogrusAdapter()
|
||||
|
||||
publisher, err := sql.NewPublisher(db, sql.PublisherConfig{
|
||||
SchemaAdapter: sql.DefaultPostgreSQLSchema{},
|
||||
AutoInitializeSchema: false,
|
||||
}, logger)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
subscriber, err := sql.NewSubscriber(db, sql.SubscriberConfig{
|
||||
SchemaAdapter: sql.DefaultPostgreSQLSchema{},
|
||||
ConsumerGroup: config.ConsumerGroup,
|
||||
}, logger)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
router, err := message.NewRouter(message.RouterConfig{}, logger)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return &PubSub{
|
||||
Publisher: publisher,
|
||||
Subscriber: subscriber,
|
||||
Router: router,
|
||||
}, nil
|
||||
}, o.DiOptions()...)
|
||||
}
|
||||
Reference in New Issue
Block a user