Bugfix and update formatter

bitrix-expert · Nov 27, 2015 · 2426db6 · 2426db6
1 parent 1123823
commit 2426db6
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/src/Formatter/BitrixFormatter.php b/src/Formatter/BitrixFormatter.php
@@ -8,6 +8,7 @@
 namespace Bex\Monolog\Formatter;
 
 use Monolog\Formatter\FormatterInterface;
+use Monolog\Logger;
 
 /**
  * @author Nik Samokhvalov <nik@samokhvalov.info>
@@ -21,18 +22,23 @@ public function format(array $record)
     {
         $record['item_id'] = null;
         $record['level'] = static::toBitrixLevel($record['level']);
-        
+
         if (!empty($record['context']))
         {
-            foreach ($record['context'] as $name => $value)
+            foreach ($record['context'] as $field => $value)
             {
-                if ($name === 'item_id')
+                if ($field === 'item_id')
                 {
                     $record['item_id'] = $value;
                 }
                 else
                 {
-                    $record['message'] .= "<br><b>" . $name . '</b>: ' . $value;
+                    if (is_array($value))
+                    {
+                        $value = var_export($value, true);
+                    }
+
+                    $record['message'] .= '<br><br>' . $field . ': ' . $value;
                 }
             }
         }

diff --git a/src/Handler/BitrixHandler.php b/src/Handler/BitrixHandler.php
@@ -43,11 +43,11 @@ public function __construct($event = null, $module = null, $level = Logger::DEBU
     protected function write(array $record)
     {
         \CEventLog::Log(
-            $record['level'],
+            $record['formatted']['level'],
             $this->getEvent(),
             $this->getModule(),
-            $record['item_id'],
-            $record['message'],
+            $record['formatted']['item_id'],
+            $record['formatted']['message'],
             $this->getSite()
         );
     }