Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Call mkdir and file_put_contents once to improve performance #649

Merged
merged 1 commit into from Dec 16, 2015
Merged

Call mkdir and file_put_contents once to improve performance #649

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
25 changes: 10 additions & 15 deletions classes/Kohana/Log/File.php
View file
Open in desktop
Expand Up @@ -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);
Expand All @@ -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);
}

}
5 changes: 5 additions & 0 deletions classes/Kohana/Log/Writer.php
View file
Open in desktop
Expand Up @@ -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);
Expand Down
11 changes: 9 additions & 2 deletions tests/kohana/Log/FileTest.php
View file
Open in desktop
Expand Up @@ -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();
Expand Down Expand Up @@ -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);
}

}