summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJordi Boggiano <j.boggiano@seld.be>2011-07-19 23:30:31 +0200
committerJordi Boggiano <j.boggiano@seld.be>2011-07-19 23:30:31 +0200
commitf9f27ce43f921bf187de449dcd24750aff4ac317 (patch)
treeea45bfe8d03bd1f1624a81c33ed84f63d8acf632
parent7788c0cee960541b7fcea64312bf51e53e7c95cd (diff)
downloadmonolog-f9f27ce43f921bf187de449dcd24750aff4ac317.zip
monolog-f9f27ce43f921bf187de449dcd24750aff4ac317.tar.gz
monolog-f9f27ce43f921bf187de449dcd24750aff4ac317.tar.bz2
Adjustments to the Memory processors
-rw-r--r--src/Monolog/Processor/MemoryPeakUsageProcessor.php7
-rw-r--r--src/Monolog/Processor/MemoryProcessor.php13
-rw-r--r--src/Monolog/Processor/MemoryUsageProcessor.php8
3 files changed, 11 insertions, 17 deletions
diff --git a/src/Monolog/Processor/MemoryPeakUsageProcessor.php b/src/Monolog/Processor/MemoryPeakUsageProcessor.php
index cb2ca21..77e0324 100644
--- a/src/Monolog/Processor/MemoryPeakUsageProcessor.php
+++ b/src/Monolog/Processor/MemoryPeakUsageProcessor.php
@@ -11,17 +11,14 @@
namespace Monolog\Processor;
-use Monolog\Processor\MemoryProcessor;
-
/**
* Injects memory_get_peak_usage in all records
*
- * @see Monolog\Processor\MemoryProcessor__construct() for options
+ * @see Monolog\Processor\MemoryProcessor::__construct() for options
* @author Rob Jensen
*/
class MemoryPeakUsageProcessor extends MemoryProcessor
{
-
/**
* @param array $record
* @return array
@@ -29,7 +26,7 @@ class MemoryPeakUsageProcessor extends MemoryProcessor
public function __invoke(array $record)
{
$bytes = memory_get_peak_usage($this->realUsage);
- $formatted = MemoryProcessor::formatBytes($bytes);
+ $formatted = self::formatBytes($bytes);
$record['extra'] = array_merge(
$record['extra'],
diff --git a/src/Monolog/Processor/MemoryProcessor.php b/src/Monolog/Processor/MemoryProcessor.php
index e2efc7b..28daa28 100644
--- a/src/Monolog/Processor/MemoryProcessor.php
+++ b/src/Monolog/Processor/MemoryProcessor.php
@@ -13,11 +13,11 @@ namespace Monolog\Processor;
/**
* Some methods that are common for all memory processors
+ *
* @author Rob Jensen
*/
class MemoryProcessor
{
-
protected $realUsage;
/**
@@ -34,18 +34,17 @@ class MemoryProcessor
* @param int $bytes
* @return string
*/
- public static function formatBytes($bytes)
+ protected static function formatBytes($bytes)
{
$bytes = (int) $bytes;
+
if ($bytes > 1024*1024) {
- $bytes = round($bytes/1024/1024, 2).' MB';
+ return round($bytes/1024/1024, 2).' MB';
} elseif ($bytes > 1024) {
- $bytes = round($bytes/1024, 2).' KB';
- } else {
- $bytes .= ' B';
+ return round($bytes/1024, 2).' KB';
}
- return $bytes;
+ return $bytes . ' B';
}
}
diff --git a/src/Monolog/Processor/MemoryUsageProcessor.php b/src/Monolog/Processor/MemoryUsageProcessor.php
index bcbed6b..0867459 100644
--- a/src/Monolog/Processor/MemoryUsageProcessor.php
+++ b/src/Monolog/Processor/MemoryUsageProcessor.php
@@ -11,16 +11,14 @@
namespace Monolog\Processor;
-use Monolog\Processor\MemoryProcessor;
-
/**
* Injects memory_get_usage in all records
- * @see Monolog\Processor\MemoryProcessor__construct() for options
+ *
+ * @see Monolog\Processor\MemoryProcessor::__construct() for options
* @author Rob Jensen
*/
class MemoryUsageProcessor extends MemoryProcessor
{
-
/**
* @param array $record
* @return array
@@ -28,7 +26,7 @@ class MemoryUsageProcessor extends MemoryProcessor
public function __invoke(array $record)
{
$bytes = memory_get_usage($this->realUsage);
- $formatted = MemoryProcessor::formatBytes($bytes);
+ $formatted = self::formatBytes($bytes);
$record['extra'] = array_merge(
$record['extra'],