slightly better error handling

darcs-hash:20080716064736-5a68a-b57c978702037f380e31d2d8825109821a01cef5.gz

diff --git a/lib/jabber.php b/lib/jabber.php
index a044f9c1b9043965f4cf659469027c4ce8481d7f..d772cd92c49749acfac8032f4e468a9454724ca8 100644 (file)
--- 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 c8e2ba16f14ddc834002c32f9534af4356e2c9f1..60697758f95f310cf1a9142316cbfc2261451a13 100755 (executable)
--- 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');