moved memory checks into maybeStopConsumer

Author: Nicola Turato

RabbitMq/BatchConsumer.php

@@ -85,10 +85,6 @@ public function execute(AMQPMessage $msg)
         $this->addMessage($msg);
 
         $this->maybeStopConsumer();
-
-        if (null !== $this->getMemoryLimit() && $this->isRamAlmostOverloaded()) {
-            $this->stopConsuming();
-        }
     }
 
     public function consume()
@@ -189,10 +185,6 @@ protected function handleProcessMessages($processFlags = null)
 
         $this->consumed++;
         $this->maybeStopConsumer();
-
-        if (null !== $this->getMemoryLimit() && $this->isRamAlmostOverloaded()) {
-            $this->stopConsuming();
-        }
     }
 
     /**
@@ -390,6 +382,10 @@ protected function maybeStopConsumer()
         if ($this->forceStop) {
             $this->stopConsuming();
         }
+
+        if (null !== $this->getMemoryLimit() && $this->isRamAlmostOverloaded()) {
+            $this->stopConsuming();
+        }
     }
 
     /**