renamed config

engelmi · Sep 7, 2021 · 9dbed02 · 9dbed02
1 parent fbfa911
commit 9dbed02
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 12 deletions.
diff --git a/config.go b/config.go
@@ -6,19 +6,19 @@ import (
 	"github.com/sirupsen/logrus"
 )
 
-type Config struct {
+type QueueConfig struct {
 	Region   string
 	Endpoint string
 	Queue    string
 }
 
 type ProducerConfig struct {
-	Config
+	QueueConfig
 	Timeout time.Duration
 }
 
 type ConsumerConfig struct {
-	Config
+	QueueConfig
 	PollTimeout         time.Duration
 	AckTimeout          time.Duration
 	MaxNumberOfMessages int64

diff --git a/examples/gopher.go b/examples/gopher.go
@@ -39,7 +39,7 @@ func (g Gopher) PushMessage(msg string) {
 
 func (g Gopher) setupProducer() gosqs.Producer {
 	p, err := gosqs.NewProducer(gosqs.ProducerConfig{
-		Config: gosqs.Config{
+		QueueConfig: gosqs.QueueConfig{
 			Region:   "eu-central-1",
 			Endpoint: "http://localhost:9324",
 			Queue:    g.queueName,
@@ -60,7 +60,7 @@ func (g Gopher) sendMessage(p gosqs.Producer, msg string) {
 
 func (g Gopher) Consume() {
 	consumer, err := gosqs.NewConsumer(gosqs.ConsumerConfig{
-		Config: gosqs.Config{
+		QueueConfig: gosqs.QueueConfig{
 			Region:   "eu-central-1",
 			Endpoint: "http://localhost:9324",
 			Queue:    g.queueName,

diff --git a/examples/panic/panic.go b/examples/panic/panic.go
@@ -16,14 +16,12 @@ func main() {
 	wg := &sync.WaitGroup{}
 
 	handler := func(ctx context.Context, receivedMsg *sqs.Message) error {
-		defer wg.Done()
-
 		fmt.Println(fmt.Sprintf("Got message '%s'", *receivedMsg.Body))
 		panic(fmt.Sprintf("Handler panic for message '%s'", *receivedMsg.Body))
 	}
 
 	consumer, err := gosqs.NewConsumer(gosqs.ConsumerConfig{
-		Config: gosqs.Config{
+		QueueConfig: gosqs.QueueConfig{
 			Region:   "eu-central-1",
 			Endpoint: "http://localhost:9324",
 			Queue:    "panic_queue",
@@ -39,9 +37,8 @@ func main() {
 	go consumer.StartListening(context.Background(), nil)
 
 	examples.NewGopher("panic_queue", "PushingGopher-1", 1*time.Second).PushMessage("Hello World! No. 1")
-	wg.Add(1)
 	examples.NewGopher("panic_queue", "PushingGopher-1", 1*time.Second).PushMessage("Hello World! No. 2")
-	wg.Add(1)
 
+	wg.Add(1)
 	wg.Wait()
 }
diff --git a/examples/panic/queues.conf b/examples/panic/queues.conf
@@ -4,5 +4,15 @@ queues {
     delay = 0 seconds
     receiveMessageWait = 0 seconds
     fifo = false
+    deadLettersQueue {
+      name = "panic_deadletter_queue"
+      maxReceiveCount = 3
+    }
+  }
+  panic_deadletter_queue {
+    defaultVisibilityTimeout = 1 seconds
+    delay = 0 seconds
+    receiveMessageWait = 0 seconds
+    fifo = false
   }
 }
diff --git a/examples/simpleConsume/simpleConsume.go b/examples/simpleConsume/simpleConsume.go
@@ -23,7 +23,7 @@ func main() {
 	}
 
 	consumer, err := gosqs.NewConsumer(gosqs.ConsumerConfig{
-		Config: gosqs.Config{
+		QueueConfig: gosqs.QueueConfig{
 			Region:   "eu-central-1",
 			Endpoint: "http://localhost:9324",
 			Queue:    "simple_consume",

diff --git a/examples/simpleProduce/simpleProduce.go b/examples/simpleProduce/simpleProduce.go
@@ -10,7 +10,7 @@ import (
 
 func main() {
 	p, err := gosqs.NewProducer(gosqs.ProducerConfig{
-		Config: gosqs.Config{
+		QueueConfig: gosqs.QueueConfig{
 			Region:   "eu-central-1",
 			Endpoint: "http://localhost:9324",
 			Queue:    "simple_produce",