Merge pull request #649 from kohana/3.4/feature/log-writer-file-perfo…

…rmance

Call `mkdir` and `file_put_contents` once to improve performance

classes/Kohana/Log/File.php

@@ -48,25 +48,20 @@ public function __construct($directory)
 	 */
 	public function write(array $messages)
 	{
-		// Set the yearly directory name
-		$directory = $this->_directory.date('Y');
+		$filtered_messages = $this->filter($messages);
 
-		if ( ! is_dir($directory))
+		if (empty($filtered_messages))
 		{
-			// Create the yearly directory
-			mkdir($directory, 02777);
-
-			// Set permissions (must be manually set to fix umask issues)
-			chmod($directory, 02777);
+			return;
 		}
 
-		// Add the month to the directory
-		$directory .= DIRECTORY_SEPARATOR.date('m');
+		// Set the yearly and monthly directory name
+		$directory = $this->_directory . date('Y' . DIRECTORY_SEPARATOR . 'm');
 
 		if ( ! is_dir($directory))
 		{
 			// Create the monthly directory
-			mkdir($directory, 02777);
+			mkdir($directory, 02777, TRUE);
 
 			// Set permissions (must be manually set to fix umask issues)
 			chmod($directory, 02777);
@@ -84,13 +79,13 @@ public function write(array $messages)
 			chmod($filename, 0666);
 		}
 
-		$filtered_messages = $this->filter($messages);
-
+		$formatted_messages = array();
 		foreach ($filtered_messages as $message)
 		{
-			// Write each message into the log file
-			file_put_contents($filename, $this->format_message($message).PHP_EOL, FILE_APPEND);
+			$formatted_messages[] = $this->format_message($message);
 		}
+
+		file_put_contents($filename, implode(PHP_EOL, $formatted_messages).PHP_EOL, FILE_APPEND);
 	}
 
 }

classes/Kohana/Log/Writer.php

@@ -197,6 +197,11 @@ public function detach_filter(Kohana_Log_Filter $filter)
 	 */
 	public function filter(array $messages)
 	{
+		if (empty($messages))
+		{
+			return [];
+		}
+
 		foreach ($this->filters as $filter)
 		{
 			$messages = $filter->process($messages);

tests/kohana/Log/FileTest.php

@@ -178,7 +178,7 @@ protected function make_dummy_written_logs(array $levels)
 		$file_header = '<?php exit; ?>' . PHP_EOL . PHP_EOL;
 
 		if (empty($levels)) {
-			return $file_header;
+			return NULL;
 		}
 
 		$logs = array();
@@ -219,7 +219,14 @@ public function get_filename()
 
 	public function get_written_logs()
 	{
-		return file_get_contents($this->get_directory() . $this->get_filename());
+		$file = $this->get_directory() . $this->get_filename();
+
+		if ( ! is_file($file))
+		{
+			return	NULL;
+		}
+
+		return file_get_contents($file);
 	}
 
 }