Changeset 1898

Timestamp:

02/01/2008 06:22:27 PM (8 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
  

Location:

trunk/system

Files:

• core/Kohana.php (modified) (6 diffs)
• core/Log.php (modified) (2 diffs)
• libraries/drivers/Database/Mysql.php (modified) (1 diff)

trunk/system/core/Kohana.php

@@ -85 +85 @@
                 set_exception_handler(array('Kohana', 'exception_handler'));
 
-                if (Config::item('log.threshold') > 0)
-                {
-                        // Enable log writing if the log threshold is above 0
-                        register_shutdown_function(array('Log', 'write'));
-                }
-
                 // Disable magic_quotes_runtime. The Input library takes care of
                 // magic_quotes_gpc later.
@@ -100 +94 @@
                 // Set locale information
                 setlocale(LC_ALL, Config::item('locale.language').'.UTF-8');
+
+                if (Config::item('log.threshold') > 0)
+                {
+                        // Get the configured log directory
+                        $log_dir = Config::item('log.directory');
+
+                        // Two possible locations
+                        $app_log = APPPATH.$log_dir;
+                        $log_dir = realpath($log_dir);
+
+                        // If the log directory does not exist, log inside of application/
+                        is_dir($log_dir) or $log_dir = $app_log;
+
+                        // Log directory must be writable
+                        if ( ! is_dir($log_dir) OR ! is_writable($log_dir))
+                                throw new Kohana_Exception('core.cannot_write_log');
+
+                        // Set the log directory
+                        Log::directory($log_dir);
+
+                        // Enable log writing if the log threshold is above 0
+                        register_shutdown_function(array('Log', 'write'));
+                }
 
                 // Enable Kohana routing
@@ -311 +328 @@
         public static function shutdown()
         {
+                while (ob_get_level() > self::$buffer_level)
+                {
+                        // Flush all open output buffers above the internal buffer
+                        ob_end_flush();
+                }
+
                 // This will flush the Kohana buffer, which sets self::$output
                 (ob_get_level() === self::$buffer_level) and ob_end_clean();
@@ -317 +340 @@
                 Event::run('system.display', self::$output);
 
-                // Render the output
+                // Render the final output
                 self::render(self::$output);
         }
@@ -490 +513 @@
                 }
 
-                if (ob_get_level() >= self::$buffer_level)
-                {
-                        // Flush the entire buffer here, to ensure the error is displayed
-                        while(ob_get_level() > self::$buffer_level) ob_end_clean();
-
-                        // Clear out the output buffer
-                        ob_clean();
+                while (ob_get_level() > self::$buffer_level)
+                {
+                        // Clean all active output buffers
+                        ob_end_clean();
                 }
 
@@ -526 +546 @@
                 // Run the system.shutdown event
                 Event::has_run('system.shutdown') or Event::run('system.shutdown');
+
+                // Turn off error reporting
+                error_reporting(0);
                 exit;
         }

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)
                 {

trunk/system/libraries/drivers/Database/Mysql.php

@@ -59 +59 @@
 
                 // Build the connection info
-                $host = (isset($host)) ? $host : $socket;
-                $port = (isset($port)) ? ':'.$port : '';
+                $host = isset($host) ? $host : $socket;
+                $port = isset($port) ? ':'.$port : '';
 
                 // Make the connection and select the database