From 4413c43eb530ec6276260ecf7a08e713323862fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=93=D0=BE=D0=BB=D0=B8=D0=BA=D0=BE=D0=B2=20Maximillian?= =?UTF-8?q?=20=D0=90=D0=BD=D1=82=D0=BE=D0=BD?= Date: Sat, 7 Nov 2026 15:43:22 +0300 Subject: [PATCH] feat(broker): lab5 make publisher thread-safe with reconnect and close --- backend/internal/broker/rabbitmq.go | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/backend/internal/broker/rabbitmq.go b/backend/internal/broker/rabbitmq.go index a9162be..dd79752 100644 --- a/backend/internal/broker/rabbitmq.go +++ b/backend/internal/broker/rabbitmq.go @@ -3,6 +3,7 @@ package broker import ( "context" "fmt" + "sync" "time" amqp "github.com/rabbitmq/amqp091-go" @@ -15,6 +16,7 @@ type Publisher interface { type RabbitPublisher struct { url string + mu sync.Mutex conn *amqp.Connection ch *amqp.Channel confirms chan amqp.Confirmation @@ -64,6 +66,15 @@ func (p *RabbitPublisher) connect() error { } func (p *RabbitPublisher) Publish(ctx context.Context, routingKey string, body []byte) error { + p.mu.Lock() + defer p.mu.Unlock() + + if p.conn == nil || p.conn.IsClosed() { + if err := p.connect(); err != nil { + return err + } + } + err := p.ch.PublishWithContext(ctx, "attachments", routingKey, false, false, amqp.Publishing{ ContentType: "application/json", DeliveryMode: amqp.Persistent, @@ -85,3 +96,15 @@ func (p *RabbitPublisher) Publish(ctx context.Context, routingKey string, body [ return ctx.Err() } } + +func (p *RabbitPublisher) Close() error { + p.mu.Lock() + defer p.mu.Unlock() + if p.ch != nil { + _ = p.ch.Close() + } + if p.conn != nil { + return p.conn.Close() + } + return nil +}