slaventius@odnookno.info 2 years ago
parent 9fa88a81b4
commit 1119a6fee2
  1. 6
      internal/authDB.go
  2. 14
      internal/transport/kafka/writer.go

@ -38,11 +38,13 @@ type AuthDBServer struct {
} }
func NewServer(ctx context.Context, config *config.Config) *AuthDBServer { func NewServer(ctx context.Context, config *config.Config) *AuthDBServer {
logger := logger.NewLogger("test3k:authDBService", config.Sentry.DSN)
return &AuthDBServer{ return &AuthDBServer{
mu: sync.Mutex{}, mu: sync.Mutex{},
users: make(map[string]*user), users: make(map[string]*user),
kafkaWriter: kafka.NewWriter(ctx, apiKafka.TopicRegistrations, net.JoinHostPort(config.Kafka.Host, strconv.Itoa(config.Kafka.Port))), kafkaWriter: kafka.NewWriter(ctx, logger, apiKafka.TopicRegistrations, net.JoinHostPort(config.Kafka.Host, strconv.Itoa(config.Kafka.Port))),
logger: logger.NewLogger("test3k:authDBService", config.Sentry.DSN), logger: logger,
ctx: ctx, ctx: ctx,
id: 0, id: 0,
} }

@ -2,15 +2,16 @@ package kafka
import ( import (
"context" "context"
"log"
"time" "time"
logger "git.slaventius.ru/test3k/umate/pkg/logger"
"github.com/segmentio/kafka-go" "github.com/segmentio/kafka-go"
) )
type KafkaWriter struct { type KafkaWriter struct {
ctx context.Context ctx context.Context
writer *kafka.Writer writer *kafka.Writer
logger *logger.Logger
first string first string
topic string topic string
} }
@ -82,7 +83,7 @@ func (s *KafkaWriter) checkTopic() error {
return era return era
} }
log.Printf("create topic %q\n", s.topic) s.logger.Printf("create topic %q\n", s.topic)
return era return era
} }
@ -90,7 +91,7 @@ func (s *KafkaWriter) checkTopic() error {
return nil return nil
} }
func NewWriter(ctx context.Context, topic string, address ...string) *KafkaWriter { func NewWriter(ctx context.Context, logger *logger.Logger, topic string, address ...string) *KafkaWriter {
s := &KafkaWriter{ s := &KafkaWriter{
ctx: ctx, ctx: ctx,
writer: &kafka.Writer{ writer: &kafka.Writer{
@ -100,14 +101,15 @@ func NewWriter(ctx context.Context, topic string, address ...string) *KafkaWrite
BatchTimeout: time.Millisecond * 100, BatchTimeout: time.Millisecond * 100,
Addr: kafka.TCP(address...), Addr: kafka.TCP(address...),
}, },
first: address[0], logger: logger,
topic: topic, first: address[0],
topic: topic,
} }
// Проверим и при необходимости создадим топик // Проверим и при необходимости создадим топик
era := s.checkTopic() era := s.checkTopic()
if era != nil { if era != nil {
log.Fatal(era) logger.Fatal(era)
} }
return s return s

Loading…
Cancel
Save