From c0cfb39d75a67b662d982a073337e3e0672cb143 Mon Sep 17 00:00:00 2001
From: Rob Jensen <robjensen82@gmail.com>
Date: Tue, 19 Jul 2011 14:15:55 +0100
Subject: [PATCH 1/2] Added memory processors

---
 src/Monolog/Processor/AbstractProcessor.php   | 23 ++++++++
 .../Processor/MemoryPeakUsageProcessor.php    | 43 +++++++++++++++
 src/Monolog/Processor/MemoryProcessor.php     | 55 +++++++++++++++++++
 .../Processor/MemoryUsageProcessor.php        | 42 ++++++++++++++
 4 files changed, 163 insertions(+)
 create mode 100644 src/Monolog/Processor/AbstractProcessor.php
 create mode 100644 src/Monolog/Processor/MemoryPeakUsageProcessor.php
 create mode 100644 src/Monolog/Processor/MemoryProcessor.php
 create mode 100644 src/Monolog/Processor/MemoryUsageProcessor.php

diff --git a/src/Monolog/Processor/AbstractProcessor.php b/src/Monolog/Processor/AbstractProcessor.php
new file mode 100644
index 00000000..0cbf67a2
--- /dev/null
+++ b/src/Monolog/Processor/AbstractProcessor.php
@@ -0,0 +1,23 @@
+<?php
+
+/*
+ * This file is part of the Monolog package.
+ *
+ * (c) Jordi Boggiano <j.boggiano@seld.be>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Monolog\Processor;
+
+/**
+ * Basic processor class
+ * @author Rob Jensen
+ */
+abstract class AbstractProcessor
+{
+
+    abstract public function __invoke( array $record );
+
+}
diff --git a/src/Monolog/Processor/MemoryPeakUsageProcessor.php b/src/Monolog/Processor/MemoryPeakUsageProcessor.php
new file mode 100644
index 00000000..12559166
--- /dev/null
+++ b/src/Monolog/Processor/MemoryPeakUsageProcessor.php
@@ -0,0 +1,43 @@
+<?php
+
+/*
+ * This file is part of the Monolog package.
+ *
+ * (c) Jordi Boggiano <j.boggiano@seld.be>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Monolog\Processor;
+
+use Monolog\Processor\MemoryProcessor;
+
+/**
+ * Injects memory_get_peak_usage in all records
+ * 
+ * @see Monolog\Processor\MemoryProcessor__construct() for options
+ * @author Rob Jensen
+ */
+class MemoryPeakUsageProcessor extends MemoryProcessor
+{
+
+    /**
+     * @param array $record
+     * @return array
+     */
+    public function __invoke(array $record)
+    {
+        $bytes = memory_get_peak_usage( $this->realUsage );
+        $formatted = MemoryProcessor::formatBytes( $bytes );
+
+        $record['extra'] = array_merge(
+            $record['extra'],
+            array(
+                'memory_peak_usage' => $formatted,
+            )
+        );
+
+        return $record;
+    }
+}
diff --git a/src/Monolog/Processor/MemoryProcessor.php b/src/Monolog/Processor/MemoryProcessor.php
new file mode 100644
index 00000000..3513e108
--- /dev/null
+++ b/src/Monolog/Processor/MemoryProcessor.php
@@ -0,0 +1,55 @@
+<?php
+
+/*
+ * This file is part of the Monolog package.
+ *
+ * (c) Jordi Boggiano <j.boggiano@seld.be>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Monolog\Processor;
+
+/**
+ * Some methods that are common for all memory processors
+ * @author Rob Jensen
+ */
+abstract class MemoryProcessor extends AbstractProcessor
+{
+
+    protected $realUsage;
+
+    /**
+     * @param array $options
+     */
+    public function __construct( $options = array() )
+    {
+        if(array_key_exists('realUsage', $options )){
+            $this->realUsage = (boolean) $options['realUsage'];
+        } else {
+            $this->realUsage = true;
+        }
+    }
+
+    /**
+     * Formats bytes into a human readable string
+     *
+     * @param int $bytes
+     * @return string
+     */
+    public static function formatBytes( $bytes )
+    {
+        $bytes = (int) $bytes;
+        if ($bytes > 1024*1024) {
+            $bytes = round($bytes/1024/1024, 2).' MB';
+        } else if ($bytes > 1024) {
+            $bytes = round($bytes/1024, 2).' KB';
+        } else {
+            $bytes .= ' B';
+        }
+
+        return $bytes;
+    }
+
+}
diff --git a/src/Monolog/Processor/MemoryUsageProcessor.php b/src/Monolog/Processor/MemoryUsageProcessor.php
new file mode 100644
index 00000000..1f6d4ab7
--- /dev/null
+++ b/src/Monolog/Processor/MemoryUsageProcessor.php
@@ -0,0 +1,42 @@
+<?php
+
+/*
+ * This file is part of the Monolog package.
+ *
+ * (c) Jordi Boggiano <j.boggiano@seld.be>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Monolog\Processor;
+
+use Monolog\Processor\MemoryProcessor;
+
+/**
+ * Injects memory_get_usage in all records
+ * @see Monolog\Processor\MemoryProcessor__construct() for options
+ * @author Rob Jensen
+ */
+class MemoryUsageProcessor extends MemoryProcessor
+{
+
+    /**
+     * @param array $record
+     * @return array
+     */
+    public function __invoke(array $record)
+    {
+        $bytes = memory_get_usage( $this->realUsage );
+        $formatted = MemoryProcessor::formatBytes( $bytes );
+
+        $record['extra'] = array_merge(
+            $record['extra'],
+            array(
+                'memory_usage' => $formatted,
+            )
+        );
+
+        return $record;
+    }
+}

From 6a2e2142d6c5052a504ba379da755d33d1445752 Mon Sep 17 00:00:00 2001
From: Rob Jensen <robjensen82@gmail.com>
Date: Tue, 19 Jul 2011 15:04:23 +0100
Subject: [PATCH 2/2] tweeks

---
 src/Monolog/Processor/AbstractProcessor.php   | 23 -------------------
 .../Processor/MemoryPeakUsageProcessor.php    |  6 ++---
 src/Monolog/Processor/MemoryProcessor.php     | 16 +++++--------
 .../Processor/MemoryUsageProcessor.php        |  4 ++--
 4 files changed, 11 insertions(+), 38 deletions(-)
 delete mode 100644 src/Monolog/Processor/AbstractProcessor.php

diff --git a/src/Monolog/Processor/AbstractProcessor.php b/src/Monolog/Processor/AbstractProcessor.php
deleted file mode 100644
index 0cbf67a2..00000000
--- a/src/Monolog/Processor/AbstractProcessor.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Processor;
-
-/**
- * Basic processor class
- * @author Rob Jensen
- */
-abstract class AbstractProcessor
-{
-
-    abstract public function __invoke( array $record );
-
-}
diff --git a/src/Monolog/Processor/MemoryPeakUsageProcessor.php b/src/Monolog/Processor/MemoryPeakUsageProcessor.php
index 12559166..cb2ca210 100644
--- a/src/Monolog/Processor/MemoryPeakUsageProcessor.php
+++ b/src/Monolog/Processor/MemoryPeakUsageProcessor.php
@@ -15,7 +15,7 @@ use Monolog\Processor\MemoryProcessor;
 
 /**
  * Injects memory_get_peak_usage in all records
- * 
+ *
  * @see Monolog\Processor\MemoryProcessor__construct() for options
  * @author Rob Jensen
  */
@@ -28,8 +28,8 @@ class MemoryPeakUsageProcessor extends MemoryProcessor
      */
     public function __invoke(array $record)
     {
-        $bytes = memory_get_peak_usage( $this->realUsage );
-        $formatted = MemoryProcessor::formatBytes( $bytes );
+        $bytes = memory_get_peak_usage($this->realUsage);
+        $formatted = MemoryProcessor::formatBytes($bytes);
 
         $record['extra'] = array_merge(
             $record['extra'],
diff --git a/src/Monolog/Processor/MemoryProcessor.php b/src/Monolog/Processor/MemoryProcessor.php
index 3513e108..e2efc7b8 100644
--- a/src/Monolog/Processor/MemoryProcessor.php
+++ b/src/Monolog/Processor/MemoryProcessor.php
@@ -15,21 +15,17 @@ namespace Monolog\Processor;
  * Some methods that are common for all memory processors
  * @author Rob Jensen
  */
-abstract class MemoryProcessor extends AbstractProcessor
+class MemoryProcessor
 {
 
     protected $realUsage;
 
     /**
-     * @param array $options
+     * @param boolean $realUsage
      */
-    public function __construct( $options = array() )
+    public function __construct($realUsage = true)
     {
-        if(array_key_exists('realUsage', $options )){
-            $this->realUsage = (boolean) $options['realUsage'];
-        } else {
-            $this->realUsage = true;
-        }
+        $this->realUsage = (boolean) $realUsage;
     }
 
     /**
@@ -38,12 +34,12 @@ abstract class MemoryProcessor extends AbstractProcessor
      * @param int $bytes
      * @return string
      */
-    public static function formatBytes( $bytes )
+    public static function formatBytes($bytes)
     {
         $bytes = (int) $bytes;
         if ($bytes > 1024*1024) {
             $bytes = round($bytes/1024/1024, 2).' MB';
-        } else if ($bytes > 1024) {
+        } elseif ($bytes > 1024) {
             $bytes = round($bytes/1024, 2).' KB';
         } else {
             $bytes .= ' B';
diff --git a/src/Monolog/Processor/MemoryUsageProcessor.php b/src/Monolog/Processor/MemoryUsageProcessor.php
index 1f6d4ab7..bcbed6b4 100644
--- a/src/Monolog/Processor/MemoryUsageProcessor.php
+++ b/src/Monolog/Processor/MemoryUsageProcessor.php
@@ -27,8 +27,8 @@ class MemoryUsageProcessor extends MemoryProcessor
      */
     public function __invoke(array $record)
     {
-        $bytes = memory_get_usage( $this->realUsage );
-        $formatted = MemoryProcessor::formatBytes( $bytes );
+        $bytes = memory_get_usage($this->realUsage);
+        $formatted = MemoryProcessor::formatBytes($bytes);
 
         $record['extra'] = array_merge(
             $record['extra'],