only one notify

This commit is contained in:
Niko Abeler 2023-02-16 20:50:58 +01:00
parent 1bf0087d10
commit 29c5b37799
2 changed files with 7 additions and 42 deletions

View File

@ -11,12 +11,12 @@ import (
type AMQPConnection struct {
conn *amqp.Connection
channel *amqp.Channel
error_chan chan *amqp.Error
error_channel chan *amqp.Error
observers []chan<- bool
}
func (amqpConn *AMQPConnection) Init() {
amqpConn.error_chan = make(chan *amqp.Error)
amqpConn.error_channel = make(chan *amqp.Error)
}
func (amqpConn *AMQPConnection) Connect() error {
@ -33,17 +33,16 @@ func (amqpConn *AMQPConnection) Connect() error {
break
}
}
amqpConn.conn.NotifyClose(amqpConn.error_chan)
ch, err := amqpConn.conn.Channel()
if err != nil {
return err
}
amqpConn.channel = ch
amqpConn.channel.NotifyClose(amqpConn.error_chan)
amqpConn.channel.NotifyClose(amqpConn.error_channel)
go func() {
for err := range amqpConn.error_chan {
for err := range amqpConn.error_channel {
log.Printf("AMQP error: %s", err)
amqpConn.Connect()
log.Println("Reconnected to RabbitMQ")

View File

@ -5,40 +5,6 @@ import (
amqp "github.com/rabbitmq/amqp091-go"
)
func create_and_connect_to_queue(ch *amqp.Channel, name string, routing_key string) <-chan amqp.Delivery {
q, err := ch.QueueDeclare(
name, // name
false, // durable
false, // delete when unused
true, // exclusive
false, // no-wait
nil, // arguments
)
failOnError(err, "Failed to declare a queue")
err = ch.QueueBind(
q.Name, // queue name
routing_key, // routing key
"amq.topic", // exchange
false,
nil,
)
failOnError(err, "Failed to bind a queue")
msgs, err := ch.Consume(
q.Name, // queue
"", // consumer
true, // auto ack
false, // exclusive
false, // no local
false, // no wait
nil, // args
)
failOnError(err, "Failed to register a consumer")
return msgs
}
type Piper struct {
influx *InfluxWriter
delivery <-chan amqp.Delivery