fix issue 126 by setting receiver settlement mode on sender

Azure · Aug 26, 2019 · 9caa976 · 9caa976
1 parent 44ab72b
commit 9caa976
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/changelog.md b/changelog.md
@@ -2,6 +2,7 @@
 
 ## `head`
 - enable partitionKey for sendBatch
+- ensure sender receives ack'd messages from EH [#126](https://github.com/Azure/azure-event-hubs-go/issues/126)
 
 ## `v2.0.1`
 - update to amqp 0.11.2 & common 2.1.0 to fix [#115](https://github.com/Azure/azure-event-hubs-go/issues/115)

diff --git a/go.mod b/go.mod
@@ -26,5 +26,5 @@ require (
 	google.golang.org/api v0.5.0 // indirect
 	google.golang.org/genproto v0.0.0-20190522204451-c2c4e71fbf69 // indirect
 	google.golang.org/grpc v1.21.0 // indirect
-	pack.ag/amqp v0.11.2
+	pack.ag/amqp v0.12.1
 )
diff --git a/go.sum b/go.sum
@@ -148,3 +148,5 @@ gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bl
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 pack.ag/amqp v0.11.2 h1:cuNDWLUTbKRtEZwhB0WQBXf9pGbm87pUBXQhvcFxBWg=
 pack.ag/amqp v0.11.2/go.mod h1:4/cbmt4EJXSKlG6LCfWHoqmN0uFdy5i/+YFz+fTfhV4=
+pack.ag/amqp v0.12.1 h1:Q/0cS8lXAT2CFu6ngcOs6Rr9j2nD67/4X3hUA3u9s0s=
+pack.ag/amqp v0.12.1/go.mod h1:4/cbmt4EJXSKlG6LCfWHoqmN0uFdy5i/+YFz+fTfhV4=
diff --git a/sender.go b/sender.go
@@ -248,7 +248,8 @@ func (s *sender) newSessionAndLink(ctx context.Context) error {
 	}
 
 	amqpSender, err := amqpSession.NewSender(
-		amqp.LinkSenderSettle(amqp.ModeUnsettled),
+		amqp.LinkSenderSettle(amqp.ModeMixed),
+		amqp.LinkReceiverSettle(amqp.ModeFirst),
 		amqp.LinkTargetAddress(s.getAddress()),
 	)
 	if err != nil {