Skip to content

Make logs more automatic-parse friendly #701

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

Open
SmiSoft wants to merge 1 commit into
base: 3.3/master
Choose a base branch
from
Open

Make logs more automatic-parse friendly #701

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion classes/Kohana/Log.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ public function add($level, $message, array $values = NULL, array $additional =
'level' => $level,
'body' => $message,
'trace' => $trace,
'file' => isset($trace[0]['file']) ? $trace[0]['file'] : NULL,
'file' => isset($trace[0]['file']) ? Debug::path($trace[0]['file']) : NULL,
'line' => isset($trace[0]['line']) ? $trace[0]['line'] : NULL,
'class' => isset($trace[0]['class']) ? $trace[0]['class'] : NULL,
'function' => isset($trace[0]['function']) ? $trace[0]['function'] : NULL,
Expand Down
4 changes: 3 additions & 1 deletion classes/Kohana/Log/Writer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,13 +73,15 @@ final public function __toString()
* @param string $format
* @return string
*/
public function format_message(array $message, $format = "time --- level: body in file:line")
public function format_message(array $message, $format = "time --- level: body ~ file [ line ]")
{
$message['time'] = Date::formatted_time('@'.$message['time'], Log_Writer::$timestamp, Log_Writer::$timezone, TRUE);
$message['level'] = $this->_log_levels[$message['level']];

$string = strtr($format, array_filter($message, 'is_scalar'));

if (substr($string,-16)===' ~ file [ line ]')
$string=substr($string,0,-16);
if (isset($message['additional']['exception']))
{
// Re-use as much as possible, just resetting the body to the trace
Expand Down