Add the 'basicCancel' method to the AMQPClient #134
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov Report
@@ Coverage Diff @@
## master #134 +/- ##
==========================================
+ Coverage 97.43% 97.47% +0.04%
==========================================
Files 13 13
Lines 117 119 +2
==========================================
+ Hits 114 116 +2
Misses 3 3
Continue to review full report at Codecov.
|
gvolpe
reviewed
Nov 22, 2018
core/src/main/scala/com/github/gvolpe/fs2rabbit/algebra/AMQPClient.scala
Outdated
Show resolved
Hide resolved
|
@gvolpe the 'basicConsume' method can return G[_] as well. I've added resource management in a scope of this change. |
gvolpe
reviewed
Nov 24, 2018
There was a problem hiding this comment.
Looks good so far!
By introducing Stream.bracket(consumerF)(tag => AMQP.basicCancel(channel, tag)) I wonder whether a consumer will re-connect in case a queue gets deleted and by the mechanism of the ResilientStream it gets re-declared.
Can you verify that these statements hold true?
- Run the
IOAckerConsumerexample. - Go to the RabbitMQ console and delete
testQ. - You see the following output:
Consumed: AmqpEnvelope(DeliveryTag(1),Hey!,AmqpProperties(None,None,None,None,None,None,None,None,None,None,Map(app -> StringVal(fs2RabbitDemo), demoId -> LongVal(123))))
Consumed: AmqpEnvelope(DeliveryTag(2),{"id":1,"name":"Sherlock","address":{"number":212,"streetName":"Baker St"}},AmqpProperties(None,None,None,None,None,None,None,None,None,None,Map()))
11:06:10.790 [scala-execution-context-global-20] INFO c.g.gvolpe.fs2rabbit.effects.Log$ - Releasing connection: amqp://guest@127.0.0.1:5672/ previously acquired.
11:06:10.806 [scala-execution-context-global-20] ERROR c.g.gvolpe.fs2rabbit.effects.Log$ - Queue might have been DELETED! amq.ctag-EJLX41gM42B3bKMJFJGlbg
java.lang.Exception: Queue might have been DELETED! amq.ctag-EJLX41gM42B3bKMJFJGlbg
at com.github.gvolpe.fs2rabbit.interpreter.AMQPClientStream$$anon$1.$anonfun$handleCancel$2(AMQPClientStream.scala:45) ~[classes/:na]
at com.github.gvolpe.fs2rabbit.interpreter.AMQPClientStream$$anon$1.$anonfun$handleCancel$2$adapted(AMQPClientStream.scala:43) ~[classes/:na]
at scala.Option.fold(Option.scala:158) ~[scala-library-2.12.7.jar:na]
at com.github.gvolpe.fs2rabbit.interpreter.AMQPClientStream$$anon$1.handleCancel(AMQPClientStream.scala:43) ~[classes/:na]
at com.rabbitmq.client.impl.ConsumerDispatcher$3.run(ConsumerDispatcher.java:115) ~[amqp-client-5.5.0.jar:5.5.0]
at com.rabbitmq.client.impl.ConsumerWorkService$WorkPoolRunnable.run(ConsumerWorkService.java:104) ~[amqp-client-5.5.0.jar:5.5.0]
at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1149) ~[na:1.8.0_161]
at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:624) ~[na:1.8.0_161]
at java.lang.Thread.run(Thread.java:748) ~[na:1.8.0_161]
11:06:10.806 [scala-execution-context-global-20] INFO c.g.gvolpe.fs2rabbit.effects.Log$ - Restarting in 5 seconds...
Consumed: AmqpEnvelope(DeliveryTag(1),Hey!,AmqpProperties(None,None,None,None,None,None,None,None,None,None,Map(app -> StringVal(fs2RabbitDemo), demoId -> LongVal(123))))
Consumed: AmqpEnvelope(DeliveryTag(2),{"id":1,"name":"Sherlock","address":{"number":212,"streetName":"Baker St"}},AmqpProperties(None,None,None,None,None,None,None,None,None,None,Map()))
core/src/main/scala/com/github/gvolpe/fs2rabbit/interpreter/AMQPClientStream.scala
Outdated
Show resolved
Hide resolved
|
My output: The only difference that there are two exceptions:
But the queue was recreated and the message was published and consumed successfully. |
|
Great, I think that's the expected behavior. Once you sync with master we can get it merged, thanks! |
gvolpe
approved these changes
Nov 24, 2018
…re/basic-cancel # Conflicts: # core/src/main/scala/com/github/gvolpe/fs2rabbit/algebra/AckConsuming.scala # core/src/main/scala/com/github/gvolpe/fs2rabbit/interpreter/AMQPClientStream.scala # core/src/main/scala/com/github/gvolpe/fs2rabbit/program/ConsumerProgram.scala
# Conflicts: # core/src/main/scala/com/github/gvolpe/fs2rabbit/algebra/AMQPClient.scala # core/src/main/scala/com/github/gvolpe/fs2rabbit/interpreter/AMQPClientStream.scala # core/src/main/scala/com/github/gvolpe/fs2rabbit/program/ConsumingProgram.scala # core/src/test/scala/com/github/gvolpe/fs2rabbit/interpreter/AMQPClientInMemory.scala # core/src/test/scala/com/github/gvolpe/fs2rabbit/interpreter/Fs2RabbitSpec.scala
|
Hi @gvolpe, I solved all conflicts. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
A consumer can be canceled even if the connection is still open. So, I have added this missing method.