From b6aed52c57895daa80674956172fcc9894d26707 Mon Sep 17 00:00:00 2001 From: Gunnar Wrobel Date: Thu, 15 Jul 2010 23:36:38 +0200 Subject: [PATCH] MFB: Cleanup logging. --- .../lib/Horde/Kolab/Filter/Configuration.php | 2 +- .../lib/Horde/Kolab/Filter/Response.php | 44 +++++++++++++++------- .../lib/Horde/Kolab/Filter/Transport/drop.php | 2 +- .../lib/Horde/Kolab/Filter/Transport/echo.php | 2 +- .../lib/Horde/Kolab/Filter/Transport/lda.php | 2 +- .../lib/Horde/Kolab/Filter/Transport/lmtp.php | 2 +- .../lib/Horde/Kolab/Filter/Transport/smtp.php | 2 +- .../lib/Horde/Kolab/Filter/Transport/stdout.php | 2 +- 8 files changed, 37 insertions(+), 21 deletions(-) diff --git a/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Configuration.php b/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Configuration.php index 1b812e88e..0e9485fc4 100644 --- a/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Configuration.php +++ b/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Configuration.php @@ -131,7 +131,7 @@ class Horde_Kolab_Filter_Configuration } /* Always display all possible problems */ - ini_set('error_reporting', E_ALL); + ini_set('error_reporting', E_ERROR); ini_set('track_errors', '1'); /* Setup error logging */ diff --git a/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Response.php b/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Response.php index 3962fb095..bb1b41c8b 100644 --- a/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Response.php +++ b/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Response.php @@ -99,7 +99,7 @@ class Horde_Kolab_Filter_Response /* Ignore strict errors for now since even PEAR will raise * strict notices */ - if ($errno == E_STRICT) { + if ($errno == E_STRICT || $errno == E_DEPRECATED) { return false; } @@ -117,7 +117,7 @@ class Horde_Kolab_Filter_Response $msg = 'PHP Error: ' . $errmsg; } - $error = new PEAR_Error($msg, $code); + $error = new PEAR_Error($msg, $code, null, null, 'FILE: ' . $filename . ', LINE: ' . $linenum); $this->handle($error); return false; @@ -134,21 +134,37 @@ class Horde_Kolab_Filter_Response $msg = $result->getMessage() . '; Code: ' . $result->getCode(); - /* Log all errors */ - $file = __FILE__; - $line = __LINE__; + $file = false; + $line = false; - $frames = $result->getBacktrace(); - if (count($frames) > 1) { - $frame = $frames[1]; - } else if (count($frames) == 1) { - $frame = $frames[0]; + $user_info = $result->getUserInfo(); + + if (!empty($user_info)) { + if (preg_match('/FILE: (.*), LINE: (.*)/', $user_info, $matches)) { + $file = $matches[1]; + $line = $matches[2]; + } } - if (isset($frame['file'])) { - $file = $frame['file']; + + if (!$file) { + $frames = $result->getBacktrace(); + if (count($frames) > 1) { + $frame = $frames[1]; + } else if (count($frames) == 1) { + $frame = $frames[0]; + } + if (isset($frame['file'])) { + $file = $frame['file']; + } + if (isset($frame['line'])) { + $line = $frame['line']; + } } - if (isset($frame['line'])) { - $line = $frame['line']; + + if (!$file) { + /* Log all errors */ + $file = __FILE__; + $line = __LINE__; } /* In debugging mode the errors get delivered to the screen diff --git a/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Transport/drop.php b/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Transport/drop.php index 045f14653..28977b420 100644 --- a/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Transport/drop.php +++ b/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Transport/drop.php @@ -21,7 +21,7 @@ class Horde_Kolab_Filter_Transport_drop extends Horde_Kolab_Filter_Transport * * @return DropWrapper Provides a null class as transport. */ - function &_createTransport() + function _createTransport() { $transport = new DropWrapper(); return $transport; diff --git a/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Transport/echo.php b/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Transport/echo.php index 0b7181dce..07ffd241c 100644 --- a/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Transport/echo.php +++ b/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Transport/echo.php @@ -21,7 +21,7 @@ class Horde_Kolab_Filter_Transport_echo extends Horde_Kolab_Filter_Transport * * @return StdOutWrapper Wraps STDOUT as transport */ - function &_createTransport() + function _createTransport() { $transport = new EchoWrapper(); return $transport; diff --git a/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Transport/lda.php b/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Transport/lda.php index f10b7b440..b2d8b7214 100644 --- a/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Transport/lda.php +++ b/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Transport/lda.php @@ -21,7 +21,7 @@ class Horde_Kolab_Filter_Transport_lda extends Horde_Kolab_Filter_Transport * * @return DovecotLDA The LDA handler. */ - function &_createTransport() + function _createTransport() { require_once dirname(__FILE__) . '/DovecotLDA.php'; diff --git a/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Transport/lmtp.php b/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Transport/lmtp.php index 6d502d8c2..e32dafc88 100644 --- a/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Transport/lmtp.php +++ b/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Transport/lmtp.php @@ -22,7 +22,7 @@ class Horde_Kolab_Filter_Transport_lmtp extends Horde_Kolab_Filter_Transport * * @return Net_LMTP The LMTP handler. */ - function &_createTransport() + function _createTransport() { require_once dirname(__FILE__) . '/LMTPTLS.php'; diff --git a/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Transport/smtp.php b/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Transport/smtp.php index 2ffb28648..bbf227277 100644 --- a/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Transport/smtp.php +++ b/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Transport/smtp.php @@ -22,7 +22,7 @@ class Horde_Kolab_Filter_Transport_smtp extends Horde_Kolab_Filter_Transport * * @return Net_SMTP The SMTP handler. */ - function &_createTransport() + function _createTransport() { require_once 'Net/SMTP.php'; diff --git a/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Transport/stdout.php b/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Transport/stdout.php index f7fe4c8dc..7dedf269e 100644 --- a/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Transport/stdout.php +++ b/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Transport/stdout.php @@ -21,7 +21,7 @@ class Horde_Kolab_Filter_Transport_stdout extends Horde_Kolab_Filter_Transport * * @return StdOutWrapper Wraps STDOUT as transport */ - function &_createTransport() + function _createTransport() { $transport = new StdOutWrapper(); return $transport; -- 2.11.0