Fix ram checker

Author: agentsib

Command/BaseConsumerCommand.php

@@ -43,7 +43,7 @@ protected function configure()
  ->addArgument('name', InputArgument::REQUIRED, 'Consumer Name')
  ->addOption('messages', 'm', InputOption::VALUE_OPTIONAL, 'Messages to consume', 0)
  ->addOption('route', 'r', InputOption::VALUE_OPTIONAL, 'Routing Key', '')
- ->addOption('memory-limit', 'l', InputOption::VALUE_OPTIONAL, 'Allowed memory for this process', null)
+ ->addOption('memory-limit', 'l', InputOption::VALUE_OPTIONAL, 'Allowed memory for this process (MB)', null)
  ->addOption('debug', 'd', InputOption::VALUE_NONE, 'Enable Debugging')
  ->addOption('without-signals', 'w', InputOption::VALUE_NONE, 'Disable catching of system signals')
  ;

MemoryChecker/MemoryConsumptionChecker.php

@@ -27,7 +27,7 @@ public function __construct(NativeMemoryUsageProvider $memoryUsageProvider) {
  *
  * @return bool
  */
- public function isRamAlmostOverloaded($allowedConsumptionUntil, $maxConsumptionAllowed)
+ public function isRamAlmostOverloaded($maxConsumptionAllowed, $allowedConsumptionUntil = 0)
  {
  $allowedConsumptionUntil = $this->convertHumanUnitToNumerical($allowedConsumptionUntil);
  $maxConsumptionAllowed = $this->convertHumanUnitToNumerical($maxConsumptionAllowed);

RabbitMq/Consumer.php

@@ -175,6 +175,6 @@ protected function isRamAlmostOverloaded()
  {
  $memoryManager = new MemoryConsumptionChecker(new NativeMemoryUsageProvider());
 
- return $memoryManager->isRamAlmostOverloaded($this->getMemoryLimit(), '5M');
+ return $memoryManager->isRamAlmostOverloaded($this->getMemoryLimit().'M', '5M');
  }
 }

Tests/Manager/MemoryCheckerTest.php

@@ -23,7 +23,7 @@ public function testMemoryIsNotAlmostOverloaded()
 
  $memoryManager = new MemoryConsumptionChecker($memoryUsageProvider);
 
- $this->assertFalse($memoryManager->isRamAlmostOverloaded($allowedConsumptionUntil, $maxConsumptionAllowed));
+ $this->assertFalse($memoryManager->isRamAlmostOverloaded($maxConsumptionAllowed, $allowedConsumptionUntil));
  }
 
  public function testMemoryIsAlmostOverloaded()
@@ -37,6 +37,32 @@ public function testMemoryIsAlmostOverloaded()
 
  $memoryManager = new MemoryConsumptionChecker($memoryUsageProvider);
 
- $this->assertTrue($memoryManager->isRamAlmostOverloaded($allowedConsumptionUntil, $maxConsumptionAllowed));
+ $this->assertTrue($memoryManager->isRamAlmostOverloaded($maxConsumptionAllowed, $allowedConsumptionUntil));
+ }
+
+ public function testMemoryExactValueIsNotAlmostOverloaded()
+ {
+ $currentMemoryUsage = '7M';
+ $maxConsumptionAllowed = '10M';
+
+ $memoryUsageProvider = $this->getMockBuilder('OldSound\\RabbitMqBundle\\MemoryChecker\\NativeMemoryUsageProvider')->getMock();
+ $memoryUsageProvider->expects($this->any())->method('getMemoryUsage')->willReturn($currentMemoryUsage);
+
+ $memoryManager = new MemoryConsumptionChecker($memoryUsageProvider);
+
+ $this->assertFalse($memoryManager->isRamAlmostOverloaded($maxConsumptionAllowed));
+ }
+
+ public function testMemoryExactValueIsAlmostOverloaded()
+ {
+ $currentMemoryUsage = '11M';
+ $maxConsumptionAllowed = '10M';
+
+ $memoryUsageProvider = $this->getMockBuilder('OldSound\\RabbitMqBundle\\MemoryChecker\\NativeMemoryUsageProvider')->getMock();
+ $memoryUsageProvider->expects($this->any())->method('getMemoryUsage')->willReturn($currentMemoryUsage);
+
+ $memoryManager = new MemoryConsumptionChecker($memoryUsageProvider);
+
+ $this->assertTrue($memoryManager->isRamAlmostOverloaded($maxConsumptionAllowed));
  }
 }