Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix set channel in Confirm mode not immediately after creating #187

Closed
wants to merge 4 commits into from
Closed
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
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ A wrapper of [rabbitmq/amqp091-go](https://github.com/rabbitmq/amqp091-go) that

Supported by [Boot.dev](https://boot.dev). If you'd like to learn about RabbitMQ and Go, you can check out [my course here](https://www.boot.dev/learn/learn-pub-sub).

[![](https://godoc.org/github.com/wagslane/go-rabbitmq?status.svg)](https://godoc.org/github.com/wagslane/go-rabbitmq)![Deploy](https://github.com/wagslane/go-rabbitmq/workflows/Tests/badge.svg)
[![](https://godoc.org/github.com/makometr/go-rabbitmq?status.svg)](https://godoc.org/github.com/makometr/go-rabbitmq)![Deploy](https://github.com/makometr/go-rabbitmq/workflows/Tests/badge.svg)

## Motivation

Expand All @@ -25,7 +25,7 @@ The goal with `go-rabbitmq` is to provide *most* (but not all) of the nitty-grit
Inside a Go module:

```bash
go get github.com/wagslane/go-rabbitmq
go get github.com/makometr/go-rabbitmq
```

## 🚀 Quick Start Consumer
Expand Down
2 changes: 1 addition & 1 deletion connection.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

amqp "github.com/rabbitmq/amqp091-go"

"github.com/wagslane/go-rabbitmq/internal/connectionmanager"
"github.com/makometr/go-rabbitmq/internal/connectionmanager"
)

// Conn manages the connection to a rabbit cluster
Expand Down
4 changes: 2 additions & 2 deletions consume.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"fmt"
"sync"

"github.com/makometr/go-rabbitmq/internal/channelmanager"
amqp "github.com/rabbitmq/amqp091-go"
"github.com/wagslane/go-rabbitmq/internal/channelmanager"
)

// Action is an action that occurs after processed this delivery
Expand Down Expand Up @@ -62,7 +62,7 @@ func NewConsumer(
return nil, errors.New("connection manager can't be nil")
}

chanManager, err := channelmanager.NewChannelManager(conn.connectionManager, options.Logger, conn.connectionManager.ReconnectInterval)
chanManager, err := channelmanager.NewChannelManager(conn.connectionManager, false, options.Logger, conn.connectionManager.ReconnectInterval)
if err != nil {
return nil, err
}
Expand Down
2 changes: 1 addition & 1 deletion consumer_options.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package rabbitmq

import (
"github.com/makometr/go-rabbitmq/internal/logger"
amqp "github.com/rabbitmq/amqp091-go"
"github.com/wagslane/go-rabbitmq/internal/logger"
)

// getDefaultConsumerOptions describes the options that will be used when a value isn't provided
Expand Down
2 changes: 1 addition & 1 deletion declare.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package rabbitmq

import (
"github.com/wagslane/go-rabbitmq/internal/channelmanager"
"github.com/makometr/go-rabbitmq/internal/channelmanager"
)

func declareQueue(chanManager *channelmanager.ChannelManager, options QueueOptions) error {
Expand Down
2 changes: 1 addition & 1 deletion examples/cluster/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package main
import (
"log"

rabbitmq "github.com/wagslane/go-rabbitmq"
rabbitmq "github.com/makometr/go-rabbitmq"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion examples/consumer/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"os/signal"
"syscall"

rabbitmq "github.com/wagslane/go-rabbitmq"
rabbitmq "github.com/makometr/go-rabbitmq"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion examples/logger/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"
"log"

rabbitmq "github.com/wagslane/go-rabbitmq"
rabbitmq "github.com/makometr/go-rabbitmq"
)

// errorLogger is used in WithPublisherOptionsLogger to create a custom logger
Expand Down
2 changes: 1 addition & 1 deletion examples/multiconsumer/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"sync"
"syscall"

rabbitmq "github.com/wagslane/go-rabbitmq"
rabbitmq "github.com/makometr/go-rabbitmq"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion examples/multipublisher/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"syscall"
"time"

rabbitmq "github.com/wagslane/go-rabbitmq"
rabbitmq "github.com/makometr/go-rabbitmq"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion examples/publisher/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"syscall"
"time"

rabbitmq "github.com/wagslane/go-rabbitmq"
rabbitmq "github.com/makometr/go-rabbitmq"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion examples/publisher_confirm/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"syscall"
"time"

rabbitmq "github.com/wagslane/go-rabbitmq"
rabbitmq "github.com/makometr/go-rabbitmq"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/wagslane/go-rabbitmq
module github.com/makometr/go-rabbitmq

go 1.22.6

Expand Down
16 changes: 12 additions & 4 deletions internal/channelmanager/channel_manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ import (
"sync"
"time"

"github.com/makometr/go-rabbitmq/internal/connectionmanager"
"github.com/makometr/go-rabbitmq/internal/dispatcher"
"github.com/makometr/go-rabbitmq/internal/logger"
amqp "github.com/rabbitmq/amqp091-go"
"github.com/wagslane/go-rabbitmq/internal/connectionmanager"
"github.com/wagslane/go-rabbitmq/internal/dispatcher"
"github.com/wagslane/go-rabbitmq/internal/logger"
)

// ChannelManager -
Expand All @@ -21,10 +21,11 @@ type ChannelManager struct {
reconnectionCount uint
reconnectionCountMu *sync.Mutex
dispatcher *dispatcher.Dispatcher
inConfirmMode bool
}

// NewChannelManager creates a new connection manager
func NewChannelManager(connManager *connectionmanager.ConnectionManager, log logger.Logger, reconnectInterval time.Duration) (*ChannelManager, error) {
func NewChannelManager(connManager *connectionmanager.ConnectionManager, confirmMode bool, log logger.Logger, reconnectInterval time.Duration) (*ChannelManager, error) {
ch, err := getNewChannel(connManager)
if err != nil {
return nil, err
Expand All @@ -39,6 +40,7 @@ func NewChannelManager(connManager *connectionmanager.ConnectionManager, log log
reconnectionCount: 0,
reconnectionCountMu: &sync.Mutex{},
dispatcher: dispatcher.NewDispatcher(),
inConfirmMode: confirmMode,
}
go chanManager.startNotifyCancelOrClosed()
return &chanManager, nil
Expand Down Expand Up @@ -119,6 +121,12 @@ func (chanManager *ChannelManager) reconnect() error {
if err != nil {
return err
}
// chaneel creating and setting confirm mode should be in the same mutex Lock interval
if chanManager.inConfirmMode {
if err = newChannel.Confirm(false); err != nil {
return err
}
}

if err = chanManager.channel.Close(); err != nil {
chanManager.logger.Warnf("error closing channel while reconnecting: %v", err)
Expand Down
4 changes: 2 additions & 2 deletions internal/connectionmanager/connection_manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (
"sync"
"time"

"github.com/makometr/go-rabbitmq/internal/dispatcher"
"github.com/makometr/go-rabbitmq/internal/logger"
amqp "github.com/rabbitmq/amqp091-go"
"github.com/wagslane/go-rabbitmq/internal/dispatcher"
"github.com/wagslane/go-rabbitmq/internal/logger"
)

// ConnectionManager -
Expand Down
2 changes: 1 addition & 1 deletion logger.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"log"
"os"

"github.com/wagslane/go-rabbitmq/internal/logger"
"github.com/makometr/go-rabbitmq/internal/logger"
)

// Logger is describes a logging structure. It can be set using
Expand Down
7 changes: 4 additions & 3 deletions publish.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (
"fmt"
"sync"

"github.com/makometr/go-rabbitmq/internal/channelmanager"
"github.com/makometr/go-rabbitmq/internal/connectionmanager"
amqp "github.com/rabbitmq/amqp091-go"
"github.com/wagslane/go-rabbitmq/internal/channelmanager"
"github.com/wagslane/go-rabbitmq/internal/connectionmanager"
)

// DeliveryMode. Transient means higher throughput but messages will not be
Expand Down Expand Up @@ -78,7 +78,7 @@ func NewPublisher(conn *Conn, optionFuncs ...func(*PublisherOptions)) (*Publishe
return nil, errors.New("connection manager can't be nil")
}

chanManager, err := channelmanager.NewChannelManager(conn.connectionManager, options.Logger, conn.connectionManager.ReconnectInterval)
chanManager, err := channelmanager.NewChannelManager(conn.connectionManager, options.ConfirmMode, options.Logger, conn.connectionManager.ReconnectInterval)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -272,6 +272,7 @@ func (publisher *Publisher) PublishWithDeferredConfirmWithContext(
}
deferredConfirmations = append(deferredConfirmations, conf)
}

return deferredConfirmations, nil
}

Expand Down