ben/sihnon-php-lib
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prevent non-error logs being fatal if logging not initialised

Browse Source
This commit is contained in:
Ben Roberts
2011-08-21 16:10:55 +01:00
parent 2f076848ea
commit 24b2c837eb
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source/lib/SihnonFramework/LogEntry.class.php
View File

@@ -126,7 +126,8 @@ class SihnonFramework_LogEntry {
protected static function log($logger, $severity, $message, $category = SihnonFramework_Log::CATEGORY_DEFAULT) { protected static function log($logger, $severity, $message, $category = SihnonFramework_Log::CATEGORY_DEFAULT) {
if (!$logger) { if (!$logger) {
throw new SihnonFramework_Exception_InvalidLog(); file_put_contents('php://stderr', "Log message raised before log initialisation: {$message}");
return false;
} }
$backtrace = debug_backtrace(false); $backtrace = debug_backtrace(false);
@@ -137,7 +138,8 @@ class SihnonFramework_LogEntry {
public static function logInternal($logger, $severity, $file, $line, $message, $category = SihnonFramework_Log::CATEGORY_DEFAULT) { public static function logInternal($logger, $severity, $file, $line, $message, $category = SihnonFramework_Log::CATEGORY_DEFAULT) {
if (!$logger) { if (!$logger) {
throw new SihnonFramework_Exception_InvalidLog(); file_put_contents('php://stderr', "Log message raised before log initialisation: {$message}");
return false;
} }
$entry = new static($severity, $category, time(), static::$localHostname, static::$localProgname, getmypid(), $file, $line, $message); $entry = new static($severity, $category, time(), static::$localHostname, static::$localProgname, getmypid(), $file, $line, $message);
@@ -157,6 +159,11 @@ class SihnonFramework_LogEntry {
} }
public static function error($logger, $message, $category = SihnonFramework_Log::CATEGORY_DEFAULT) { public static function error($logger, $message, $category = SihnonFramework_Log::CATEGORY_DEFAULT) {
// Treat errors as fatal if they can't be logged.
if (!$logger) {
throw new SihnonFramework_Exception_InvalidLog();
}
static::log($logger, SihnonFramework_Log::LEVEL_ERROR, $message, $category); static::log($logger, SihnonFramework_Log::LEVEL_ERROR, $message, $category);
} }