Merge remote-tracking branch 'origin/master'

avast · Dec 19, 2018 · 243aa8c · 243aa8c
2 parents f5c6e17 + f374e54
commit 243aa8c
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/core/src/main/scala/com/avast/clients/rabbitmq/DefaultRabbitMQClientFactory.scala b/core/src/main/scala/com/avast/clients/rabbitmq/DefaultRabbitMQClientFactory.scala
@@ -523,16 +523,18 @@ private[rabbitmq] object DefaultRabbitMQClientFactory extends LazyLogging {
         val timedOutAction = if (processTimeout == Duration.ZERO) {
           action
         } else {
-          action.timeout(ScalaDuration(processTimeout.toMillis, TimeUnit.MILLISECONDS))
+          action
+            .timeout(ScalaDuration(processTimeout.toMillis, TimeUnit.MILLISECONDS))
+            .onErrorRecoverWith {
+              case e: TimeoutException =>
+                timeoutsMeter.mark()
+                logger.warn(s"[$name] Task timed-out, applying DeliveryResult.${consumerConfig.timeoutAction}", e)
+                Task.now(consumerConfig.timeoutAction)
+            }
         }
 
         timedOutAction
           .onErrorRecoverWith {
-            case e: TimeoutException =>
-              timeoutsMeter.mark()
-              logger.warn(s"[$name] Task timed-out, applying DeliveryResult.${consumerConfig.timeoutAction}", e)
-              Task.now(consumerConfig.timeoutAction)
-
             case NonFatal(e) =>
               fatalFailuresMeter.mark()
               logger.warn(s"[$name] Error while executing callback, applying DeliveryResult.${consumerConfig.failureAction}", e)