OpencachingDeutschland/oc-server3
1
0
Fork 0
Code Issues Pull Requests Releases Activity

improved error handling and reporting

Browse Source
This commit is contained in:
following
2013-03-25 16:26:20 +01:00
parent 21d92feba0
commit c053df0612
6 changed files with 121 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/lib2/common.inc.php
View File

@@ -54,6 +54,7 @@ function __autoload($class_name)
$opt['debug'] = $opt['debug'] & ~DEBUG_TRANSLATE;
}
require_once($opt['rootpath'] . 'lib2/errorhandler.inc.php');
configure_php();
require($opt['rootpath'] . 'lib2/cookie.class.php');
@@ -139,6 +140,9 @@ function configure_php()
ini_set('display_errors', true);
ini_set('error_reporting', E_ALL);
ini_set('mysql.trace_mode', true);
// not for production use yet (has to be tested thoroughly)
register_errorhandlers();
}
else
{

9
htdocs/lib2/db.inc.php
View File

@@ -895,11 +895,14 @@
// build the error template (e.g. because connection was lost, or an error mail
// could not load translations from database)
$dberrmsg = 'MySQL error (' . $errno . '): ' . $error;
require("html/dberror.php");
if ($opt['db']['error']['display'] == true)
$errmsg = 'MySQL error recursion (' . $errno . '): ' . $error;
else
$errmsg = "";
$errtitle = "Datenbankfehler";
require("html/error.php");
exit;
}
$db['error'] = true;
if ($db['connected'] == false)

93
htdocs/lib2/errorhandler.inc.php Normal file
View File

@@ -0,0 +1,93 @@
<?php
/***************************************************************************
* For license information see doc/license.txt
*
* Unicode Reminder メモ
*
* This is included from both lib1 and lib2.
***************************************************************************/
$error_handled = false;
function register_errorhandlers()
{
set_error_handler('errorhandler', E_ERROR);
register_shutdown_function('shutdownhandler');
}
function errorhandler($errno, $errstr, $errfile, $errline)
{
// will catch a few runtime errors
global $error_handled;
if (!$error_handled)
{
$error_handled = true;
$errtitle = "PHP-Fehler";
$error = "($errno) $errstr at line $errline in $errfile";
send_errormail($error);
if (display_error())
$errmsg = $error;
else
$errmsg = "";
require(dirname(__FILE__) . "/../html/error.php");
exit;
}
}
function shutdownhandler()
{
// see http://stackoverflow.com/questions/1900208/php-custom-error-handler-handling-parse-fatal-errors
//
// will catch anything but parse errors
global $error_handled;
if (!$error_handled &&
function_exists("error_get_last") && /* PHP >= 5.2.0 */ ($error = error_get_last()) &&
in_array($error['type'], array(E_ERROR, E_CORE_ERROR, E_COMPILE_ERROR, E_USER_ERROR)))
{
$error_handled = true;
$error = "(" . $error['type'] . ") " . $error['message'] .
" at line " . $error['line'] . " of " . $error['file'];
send_errormail($error);
$errtitle = "PHP-Fehler";
if (display_error())
$errmsg = $error;
else
$errmsg = "";
require(dirname(__FILE__) . "/../html/error.php");
}
}
function display_error()
{
global $opt, $debug_page;
return (isset($opt['db']['error']['display']) && $opt['db']['error']['display']) ||
(isset($debug_page) && $debug_page);
}
function send_errormail($errmsg)
{
global $opt, $sql_errormail, $absolute_server_URI;
if (isset($opt['db']['error']['mail']) && $opt['db']['error']['mail'] != '')
{
@mb_send_mail($opt['db']['error']['mail'], $opt['mail']['subject'] . " PHP error", $errmsg);
}
else if (isset($sql_errormail) && $sql_errormail != '')
{
$url = parse_url($absolute_server_URI);
@mb_send_mail($sql_errormail, "[" . $url['host'] . "] PHP error", $errmsg);
}
}
?>