Changeset 1898 for trunk/system/core/Log.php

Timestamp:

02/01/2008 06:22:27 PM (10 months ago)

Author:

Shadowhand

Message:

Updates to core:

• Kohana::shutdown, Kohana::exeception_handler updated to provide slightly more more consistent results, in more situations
  
• Kohana::exeception handler now disables error reporting after the first error, to prevent errors being reporting during shutdown and causing server/browser errors (Thanks PugFish?)
  
• Log::write no longer checks if the output directory is writable. Instead, Kohana::setup makes the check, resulting in detectable "log directory unwritable" errors
  

Files:

• trunk/system/core/Log.php (modified) (2 diffs)

trunk/system/core/Log.php

@@ -12 +12 @@
 final class Log {
 
+        private static $log_directory;
+
         private static $types = array(1 => 'error', 2 => 'debug', 3 => 'info');
         private static $messages = array();
+
+        /**
+         * Set the the log directory. The log directory is determined by Kohana::setup.
+         *
+         * @param   string   full log directory path
+         * @return  void
+         */
+        public static function directory($directory)
+        {
+                if (self::$log_directory === NULL)
+                {
+                        // Set the log directory if it has not already been set
+                        self::$log_directory = $directory;
+                }
+        }
 
         /**
@@ -38 +55 @@
         public static function write()
         {
-                $filename  = Config::item('log.directory');
+                // Set the log threshold
                 $threshold = Config::item('log.threshold');
 
                 // Don't log if there is nothing to log to
-                if ($threshold < 1 OR count(self::$messages) == 0 OR $filename == FALSE) return;
+                if ($threshold < 1 OR count(self::$messages) === 0) return;
 
-                // Make sure that the log directory is absolute
-                $filename = (substr($filename, 0, 1) === '/') ? $filename : APPPATH.$filename;
+                // Set the log filename
+                $filename = self::$log_directory.date('Y-m-d').'.log'.EXT;
 
-                // Find the realpath to the log directory
-                $filename = realpath($filename).'/';
-
-                // Make sure the log directory is writable
-                if ( ! is_dir($filename) OR ! is_writable($filename))
-                {
-                        // Disable errors
-                        $ER = error_reporting(0);
-
-                        // Clear the buffer
-                        ob_get_level() and ob_clean();
-
-                        // Enable errors
-                        error_reporting($ER);
-
-                        exit(Kohana::lang('core.cannot_write_log'));
-                }
-
-                // Attach the filename to the directory
-                $filename .= date('Y-m-d').'.log'.EXT;
-
+                // Compile the messages
                 $messages = '';
-
-                // Get messages
                 foreach(self::$messages as $type => $data)
                 {