summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Prodromou <evan@boursin.controlezvous.ca>2008-07-16 02:47:36 -0400
committerEvan Prodromou <evan@boursin.controlezvous.ca>2008-07-16 02:47:36 -0400
commit3d96d6f5f7ce70108cebaffdbe06956cbd6ccb99 (patch)
tree13bb10666e49161b26d383c4f04f8b3dbea68280
parentc265587612231dc8b556fd9792821fb03afe9f38 (diff)
slightly better error handling
darcs-hash:20080716064736-5a68a-b57c978702037f380e31d2d8825109821a01cef5.gz
-rw-r--r--lib/jabber.php2
-rwxr-xr-xxmppdaemon.php26
2 files changed, 25 insertions, 3 deletions
diff --git a/lib/jabber.php b/lib/jabber.php
index a044f9c1b..d772cd92c 100644
--- a/lib/jabber.php
+++ b/lib/jabber.php
@@ -39,7 +39,7 @@ class Laconica_XMPP extends XMPPHP_XMPP {
$out .= "</message>";
$cnt = strlen($out);
- common_log(LOG_DEBUG, 'Sending $cnt chars to $to');
+ common_log(LOG_DEBUG, "Sending $cnt chars to $to");
$this->send($out);
common_log(LOG_DEBUG, 'Done.');
}
diff --git a/xmppdaemon.php b/xmppdaemon.php
index c8e2ba16f..60697758f 100755
--- a/xmppdaemon.php
+++ b/xmppdaemon.php
@@ -19,8 +19,30 @@
*/
function xmppdaemon_error_handler($errno, $errstr, $errfile, $errline, $errcontext) {
- print "Error $errno in $errfile[$errline]: $errstr\n";
- die();
+ switch ($errno) {
+ case E_USER_ERROR:
+ echo "<b>My ERROR</b> [$errno] $errstr<br />\n";
+ echo " Fatal error on line $errline in file $errfile";
+ echo ", PHP " . PHP_VERSION . " (" . PHP_OS . ")<br />\n";
+ echo "Aborting...<br />\n";
+ exit(1);
+ break;
+
+ case E_USER_WARNING:
+ echo "<b>My WARNING</b> [$errno] $errstr<br />\n";
+ break;
+
+ case E_USER_NOTICE:
+ echo "<b>My NOTICE</b> [$errno] $errstr<br />\n";
+ break;
+
+ default:
+ echo "Unknown error type: [$errno] $errstr<br />\n";
+ break;
+ }
+
+ /* Don't execute PHP internal error handler */
+ return true;
}
set_error_handler('xmppdaemon_error_handler');