Refactor AMQP 1.0 outcomes handling in go-amqp

Zerpet · Zerpet · commit 04b88a7b4301 · 2026-04-20T13:48:26.000+01:00
Explicitly handle Rejected, Released, and Modified delivery states in publisher outcomes, failing on them specifically instead of catching all non-Accepted outcomes in a default block.

Made-with: Cursor
diff --git a/go-amqp/emit_log.go b/go-amqp/emit_log.go
@@ -40,8 +40,14 @@ func main() {
 	}
 	switch res.Outcome.(type) {
 	case *rmq.StateAccepted:
+	case *rmq.StateRejected:
+		log.Fatalf("Message was rejected: %v", res.Outcome)
+	case *rmq.StateReleased:
+		log.Fatalf("Message was released: %v", res.Outcome)
+	case *rmq.StateModified:
+		log.Fatalf("Message was modified: %v", res.Outcome)
 	default:
-		log.Panicf("Unexpected publish outcome: %v", res.Outcome)
+		log.Fatalf("Unexpected publish outcome: %v", res.Outcome)
 	}
 	log.Printf(" [x] Sent %s", body)
 }
diff --git a/go-amqp/emit_log_direct.go b/go-amqp/emit_log_direct.go
@@ -43,8 +43,14 @@ func main() {
 	}
 	switch res.Outcome.(type) {
 	case *rmq.StateAccepted:
+	case *rmq.StateRejected:
+		log.Fatalf("Message was rejected: %v", res.Outcome)
+	case *rmq.StateReleased:
+		log.Fatalf("Message was released: %v", res.Outcome)
+	case *rmq.StateModified:
+		log.Fatalf("Message was modified: %v", res.Outcome)
 	default:
-		log.Panicf("Unexpected publish outcome: %v", res.Outcome)
+		log.Fatalf("Unexpected publish outcome: %v", res.Outcome)
 	}
 	log.Printf(" [x] Sent %s", body)
 }
diff --git a/go-amqp/emit_log_topic.go b/go-amqp/emit_log_topic.go
@@ -43,8 +43,14 @@ func main() {
 	}
 	switch res.Outcome.(type) {
 	case *rmq.StateAccepted:
+	case *rmq.StateRejected:
+		log.Fatalf("Message was rejected: %v", res.Outcome)
+	case *rmq.StateReleased:
+		log.Fatalf("Message was released: %v", res.Outcome)
+	case *rmq.StateModified:
+		log.Fatalf("Message was modified: %v", res.Outcome)
 	default:
-		log.Panicf("Unexpected publish outcome: %v", res.Outcome)
+		log.Fatalf("Unexpected publish outcome: %v", res.Outcome)
 	}
 	log.Printf(" [x] Sent %s", body)
 }
diff --git a/go-amqp/new_task.go b/go-amqp/new_task.go
@@ -40,8 +40,14 @@ func main() {
 	}
 	switch res.Outcome.(type) {
 	case *rmq.StateAccepted:
+	case *rmq.StateRejected:
+		log.Fatalf("Message was rejected: %v", res.Outcome)
+	case *rmq.StateReleased:
+		log.Fatalf("Message was released: %v", res.Outcome)
+	case *rmq.StateModified:
+		log.Fatalf("Message was modified: %v", res.Outcome)
 	default:
-		log.Panicf("Unexpected publish outcome: %v", res.Outcome)
+		log.Fatalf("Unexpected publish outcome: %v", res.Outcome)
 	}
 	log.Printf(" [x] Sent %s", body)
 }
diff --git a/go-amqp/publisher_confirms.go b/go-amqp/publisher_confirms.go
@@ -75,7 +75,13 @@ func publish(conn *rmq.AmqpConnection, qName, text string) {
 	switch res.Outcome.(type) {
 	case *rmq.StateAccepted:
 		log.Printf("Confirmed")
+	case *rmq.StateRejected:
+		log.Fatalf("Message was rejected: %v", res.Outcome)
+	case *rmq.StateReleased:
+		log.Fatalf("Message was released: %v", res.Outcome)
+	case *rmq.StateModified:
+		log.Fatalf("Message was modified: %v", res.Outcome)
 	default:
-		log.Printf("Unexpected outcome: %v", res.Outcome)
+		log.Fatalf("Unexpected publish outcome: %v", res.Outcome)
 	}
 }
diff --git a/go-amqp/send.go b/go-amqp/send.go
@@ -38,8 +38,14 @@ func main() {
 	}
 	switch res.Outcome.(type) {
 	case *rmq.StateAccepted:
+	case *rmq.StateRejected:
+		log.Fatalf("Message was rejected: %v", res.Outcome)
+	case *rmq.StateReleased:
+		log.Fatalf("Message was released: %v", res.Outcome)
+	case *rmq.StateModified:
+		log.Fatalf("Message was modified: %v", res.Outcome)
 	default:
-		log.Panicf("Unexpected publish outcome: %v", res.Outcome)
+		log.Fatalf("Unexpected publish outcome: %v", res.Outcome)
 	}
 	log.Printf(" [x] Sent %s\n", body)
 }

Original file line number	Diff line number	Diff line change
`@@ -40,8 +40,14 @@ func main() {`
`40`	`40`	`}`
`41`	`41`	`switch res.Outcome.(type) {`
`42`	`42`	`case *rmq.StateAccepted:`
	`43`	`+ case *rmq.StateRejected:`
	`44`	`+ log.Fatalf("Message was rejected: %v", res.Outcome)`
	`45`	`+ case *rmq.StateReleased:`
	`46`	`+ log.Fatalf("Message was released: %v", res.Outcome)`
	`47`	`+ case *rmq.StateModified:`
	`48`	`+ log.Fatalf("Message was modified: %v", res.Outcome)`
`43`	`49`	`default:`
`44`		`- log.Panicf("Unexpected publish outcome: %v", res.Outcome)`
	`50`	`+ log.Fatalf("Unexpected publish outcome: %v", res.Outcome)`
`45`	`51`	`}`
`46`	`52`	`log.Printf(" [x] Sent %s", body)`
`47`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,8 +43,14 @@ func main() {`
`43`	`43`	`}`
`44`	`44`	`switch res.Outcome.(type) {`
`45`	`45`	`case *rmq.StateAccepted:`
	`46`	`+ case *rmq.StateRejected:`
	`47`	`+ log.Fatalf("Message was rejected: %v", res.Outcome)`
	`48`	`+ case *rmq.StateReleased:`
	`49`	`+ log.Fatalf("Message was released: %v", res.Outcome)`
	`50`	`+ case *rmq.StateModified:`
	`51`	`+ log.Fatalf("Message was modified: %v", res.Outcome)`
`46`	`52`	`default:`
`47`		`- log.Panicf("Unexpected publish outcome: %v", res.Outcome)`
	`53`	`+ log.Fatalf("Unexpected publish outcome: %v", res.Outcome)`
`48`	`54`	`}`
`49`	`55`	`log.Printf(" [x] Sent %s", body)`
`50`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,8 +38,14 @@ func main() {`
`38`	`38`	`}`
`39`	`39`	`switch res.Outcome.(type) {`
`40`	`40`	`case *rmq.StateAccepted:`
	`41`	`+ case *rmq.StateRejected:`
	`42`	`+ log.Fatalf("Message was rejected: %v", res.Outcome)`
	`43`	`+ case *rmq.StateReleased:`
	`44`	`+ log.Fatalf("Message was released: %v", res.Outcome)`
	`45`	`+ case *rmq.StateModified:`
	`46`	`+ log.Fatalf("Message was modified: %v", res.Outcome)`
`41`	`47`	`default:`
`42`		`- log.Panicf("Unexpected publish outcome: %v", res.Outcome)`
	`48`	`+ log.Fatalf("Unexpected publish outcome: %v", res.Outcome)`
`43`	`49`	`}`
`44`	`50`	`log.Printf(" [x] Sent %s\n", body)`
`45`	`51`	`}`