diff --git a/handler.go b/handler.go index 68f5815..6a8dd3f 100644 --- a/handler.go +++ b/handler.go @@ -13,7 +13,7 @@ import ( type Client struct { mutex *sync.Mutex - queueName string + queueOptions *QueueOpts logger *log.Logger connection *amqp.Connection Channel *amqp.Channel @@ -36,7 +36,16 @@ type options struct { logger *log.Logger } -func NewClient(address Address, queueName string, opts ...Option) (*Client, error) { +type QueueOpts struct { + QueueName string + Durable bool + AutoDelete bool + Exclusive bool + NoWait bool + Args amqp.Table +} + +func NewClient(address Address, queueOpts QueueOpts, opts ...Option) (*Client, error) { l := log.New(os.Stdout, "", log.LstdFlags) addr, err := address.makeAddr() @@ -44,16 +53,16 @@ func NewClient(address Address, queueName string, opts ...Option) (*Client, erro return nil, errors.Join(errBadAddr, err) } - if queueName == "" { + if queueOpts.QueueName == "" { l.Fatal(errNoQueue) } client := Client{ - mutex: &sync.Mutex{}, - queueName: queueName, - done: make(chan bool), - connected: make(chan struct{}), - logger: l, + mutex: &sync.Mutex{}, + queueOptions: &queueOpts, + done: make(chan bool), + connected: make(chan struct{}), + logger: l, } o := options{ diff --git a/service.go b/service.go index 6e3355d..c3f9ec8 100644 --- a/service.go +++ b/service.go @@ -78,7 +78,16 @@ func (c *Client) init(conn *amqp.Connection) error { return err } - _, err = ch.QueueDeclare(c.queueName, false, false, false, false, nil) + //_, err = ch.QueueDeclare(c.queueName, false, false, false, false, nil) + _, err = ch.QueueDeclare( + c.queueOptions.QueueName, + c.queueOptions.Durable, + c.queueOptions.AutoDelete, + c.queueOptions.Exclusive, + c.queueOptions.NoWait, + c.queueOptions.Args, + ) + if err != nil { return err } @@ -120,7 +129,7 @@ func (c *Client) unsafePush(data []byte) error { return c.Channel.PublishWithContext( ctx, "", - c.queueName, + c.queueOptions.QueueName, false, false, amqp.Publishing{ @@ -147,7 +156,7 @@ func (c *Client) consume() (<-chan amqp.Delivery, error) { } return c.Channel.Consume( - c.queueName, + c.queueOptions.QueueName, "", false, false,