Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 48 additions & 0 deletions pkg/events/rabbitmq/options.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,54 @@ import (
"github.com/gothunder/thunder/internal/events/rabbitmq"
)

func WithURL(url string) rabbitmq.RabbitmqConfigOption {
return func(c *rabbitmq.Config) {
c.URL = url
}
}

func WithExchangeName(name string) rabbitmq.RabbitmqConfigOption {
return func(c *rabbitmq.Config) {
c.ExchangeName = name
}
}

func WithQueueName(name string) rabbitmq.RabbitmqConfigOption {
return func(c *rabbitmq.Config) {
c.QueueName = name
}
}

func WithConsumerName(name string) rabbitmq.RabbitmqConfigOption {
return func(c *rabbitmq.Config) {
c.ConsumerName = name
}
}

func WithConsumerConcurrency(concurrency int) rabbitmq.RabbitmqConfigOption {
return func(c *rabbitmq.Config) {
c.ConsumerConcurrency = concurrency
}
}

func WithPrefetchCount(prefetch int) rabbitmq.RabbitmqConfigOption {
return func(c *rabbitmq.Config) {
c.PrefetchCount = prefetch
}
}

func WithMaxRetries(maxRetries int) rabbitmq.RabbitmqConfigOption {
return func(c *rabbitmq.Config) {
c.MaxRetries = maxRetries
}
}

func WithDeleteDLX(deleteDLX bool) rabbitmq.RabbitmqConfigOption {
return func(c *rabbitmq.Config) {
c.DeleteDLX = deleteDLX
}
}

func WithQueueNamePosfix(posfix string) rabbitmq.RabbitmqConfigOption {
return func(c *rabbitmq.Config) {
c.QueueName = fmt.Sprintf("%s_%s", c.QueueName, posfix)
Expand Down
65 changes: 65 additions & 0 deletions pkg/log/slog_bridge.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
package log

import (
"context"
"encoding/json"
"log/slog"

"github.com/rs/zerolog"
)

type slogWriter struct {
logger *slog.Logger
}

func (w *slogWriter) Write(p []byte) (n int, err error) {
var entry map[string]interface{}
if err := json.Unmarshal(p, &entry); err != nil {
w.logger.Info(string(p))
return len(p), nil
}

level := slog.LevelInfo
if lvl, ok := entry["level"].(string); ok {
switch lvl {
case "debug", "trace":
level = slog.LevelDebug
case "info":
level = slog.LevelInfo
case "warn", "warning":
level = slog.LevelWarn
case "error", "fatal", "panic":
level = slog.LevelError
}
delete(entry, "level")
}

msg := ""
if m, ok := entry["message"].(string); ok {
msg = m
delete(entry, "message")
}

delete(entry, "time")

args := make([]any, 0, len(entry)*2)
for k, v := range entry {
args = append(args, k, v)
}

w.logger.Log(context.Background(), level, msg, args...)
return len(p), nil
}

// NewLoggerFromSlog creates a *zerolog.Logger that outputs to the given slog.Logger.
// Use this when your service uses slog but needs to pass a logger to Thunder.
//
// Example:
//
// logger := log.NewLoggerFromSlog(slog.Default())
// consumer, _ := rabbitmq.NewRabbitMQConsumer(logger, ...)
func NewLoggerFromSlog(slogger *slog.Logger) *zerolog.Logger {
writer := &slogWriter{logger: slogger}
logger := zerolog.New(writer).With().Timestamp().Logger()
return &logger
}