Ancestor correction, reading parameters changed

Harmonious.php

@@ -349,7 +349,7 @@
                 if ( $logger ) {
                     $this->log->setLogger($logger);
                 } else {
-                    $this->log->setLogger(new Harmonious_Logger($this->config('log.path'), $this->config('log.level')));
+                    $this->log->setLogger(new Harmonious_Logger($this));
                 }
             }
             return $this->log;

Json_Logger.php

@@ -1,135 +1,28 @@
 <?php
+require 'Logger.php';
+
 /**
- * Logger
+ * Json_Logger
  *
  * @since   Version 1.0
  */
-class Harmonious_Json_Logger {
-
-    /**
-     * @var array Log levels
-     */
-    protected $levels = array(
-        0 => 'FATAL',
-        1 => 'ERROR',
-        2 => 'WARN',
-        3 => 'INFO',
-        4 => 'DEBUG'
-    );
-
-    /**
-     * @var string Absolute path to log directory with trailing slash
-     */
-    protected $directory;
+class Harmonious_Json_Logger extends Harmonious_Logger {
+    protected $ignore_simple_texts = false;
 
     /**
      * Constructor
      * @param   string  $directory  Absolute or relative path to log directory
      * @param   int     $level      The maximum log level reported by this Logger
      */
-    public function __construct( $directory, $level = 4 ) {
+    public function __construct( $app ) {
+        $this->app = $app;
+        $directory = $app->config('json_log.path');
+        $level = $app->config('json_log.level');        
+        $this->ignore_simple_texts = $app->config('json_log.ignore_simple_objects');
         $this->setDirectory($directory);
         $this->setLevel($level);
     }
 
-    /**
-     * Set log directory
-     * @param   string  $directory  Absolute or relative path to log directory
-     * @return  void
-     */
-    public function setDirectory( $directory ) {
-        $realPath = realpath($directory);
-        if ( $realPath ) {
-            $this->directory = rtrim($realPath, '/') . '/';
-        } else {
-            $this->directory = false;
-        }
-    }
-
-    /**
-     * Get log directory
-     * @return string|false Absolute path to log directory with trailing slash
-     */
-    public function getDirectory() {
-        return $this->directory;
-    }
-
-    /**
-     * Set log level
-     * @param   int                         The maximum log level reported by this Logger
-     * @return  void
-     * @throws  InvalidArgumentException    If level specified is not 0, 1, 2, 3, 4
-     */
-    public function setLevel( $level ) {
-        $theLevel = (int)$level;
-        if ( $theLevel >= 0 && $theLevel <= 4 ) {
-            $this->level = $theLevel;
-        } else {
-            throw new InvalidArgumentException('Invalid Log Level. Must be one of: 0, 1, 2, 3, 4.');
-        }
-    }
-
-    /**
-     * Get log level
-     * @return int
-     */
-    public function getLevel() {
-        return $this->level;
-    }
-
-    /**
-     * Log debug data
-     * @param   mixed $data
-     * @return  void
-     */
-    public function debug( $data ) {
-        $this->log($data, 4);
-    }
-
-    /**
-     * Log info data
-     * @param   mixed $data
-     * @return  void
-     */
-    public function info( $data ) {
-        $this->log($data, 3);
-    }
-
-    /**
-     * Log warn data
-     * @param   mixed $data
-     * @return  void
-     */
-    public function warn( $data ) {
-        $this->log($data, 2);
-    }
-
-    /**
-     * Log error data
-     * @param   mixed $data
-     * @return  void
-     */
-    public function error( $data ) {
-        $this->log($data, 1);
-    }
-
-    /**
-     * Log fatal data
-     * @param   mixed $data
-     * @return  void
-     */
-    public function fatal( $data ) {
-        $this->log($data, 0);
-    }
-
-    /**
-     * Get absolute path to current daily log file
-     * @return string
-     */
-    public function getFile() {
-        return $this->getDirectory() . strftime('%Y-%m-%d') . '.log';
-    }
-
     /**
      * Log data to file
      * @param   mixed               $data
@@ -151,6 +44,7 @@ class Harmonious_Json_Logger {
         } elseif (is_object($data)) {
             $object = (array)$data;
         } else {
+            if ($this->ignore_simple_texts) return;
             $object = array();
             $object['text'] = (string)$data;
         }
@@ -159,17 +53,8 @@ class Harmonious_Json_Logger {
         $object['time'] = date('c');
         
         if ( $level <= $this->getLevel() ) {
-            $this->write(json_encode($object)."\n");
-        }
+            $this->write(json_encode($object)."\r\n");
         }
-
-    /**
-     * Persist data to log
-     * @param   string Log message
-     * @return  void
-     */
-    protected function write( $data ) {
-        @file_put_contents($this->getFile(), $data, FILE_APPEND | LOCK_EX);
     }
 
 }

Logger.php

@@ -14,6 +14,8 @@ class Harmonious_Logger {
     /**
      * @var array Log levels
      */
+    protected $app;
+    
     protected $levels = array(
         0 => 'FATAL',
         1 => 'ERROR',
@@ -27,12 +29,18 @@ class Harmonious_Logger {
      */
     protected $directory;
     
+    protected $ignore_arrays = false;
+
     /**
      * Constructor
      * @param   string  $directory  Absolute or relative path to log directory
      * @param   int     $level      The maximum log level reported by this Logger
      */
-    public function __construct( $directory, $level = 4 ) {
+    public function __construct( $app ) {
+        $this->app = $app;
+        $directory = $app->config('log.path');
+        $level = $app->config('log.level');
+        $this->ignore_arrays = $app->config('log.ignore_arrays');
         $this->setDirectory($directory);
         $this->setLevel($level);
     }
@@ -151,10 +159,12 @@ class Harmonious_Logger {
             throw new RuntimeException("Log directory '$dir' not writable.");
         }
         if ( $level <= $this->getLevel() ) {
+            $message = '';
             if (is_object($data)) $data = (array)$data;
             if (is_array($data)) {
                 if (isset($data['message'])) $message = (string)$data['message'];
                 else {
+                    if ($this->ignore_arrays) return;
                     reset($data);
                     $message = (string)current($data);    
                 }