In case of non-blocking connections (and that is for 99.9999% the case here)

[hub.git] / application / hub / exceptions.php

diff --git a/application/hub/exceptions.php b/application/hub/exceptions.php
index ed80b25d53bf563d2c7e5fd9d62d99abb075c727..8eefa5ea554366f8fac8de19fb38fe3620982521 100644 (file)
--- a/application/hub/exceptions.php
+++ b/application/hub/exceptions.php
@@ -2,9 +2,9 @@
 /**
  * An include file for setting up the exception handler of the hub
  *
- * @author             Roland Haeder <webmaster@ship-simu.org>
+ * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0
- * @copyright  Copyright (c) 2007 - 2008 Roland Haeder, 2009 - 2012 Hub Developer Team
+ * @copyright  Copyright (c) 2007 - 2008 Roland Haeder, 2009 - 2015 Hub Developer Team
  * @license            GNU GPL 3.0 or any newer version
  *
  * This program is free software: you can redistribute it and/or modify
@@ -33,11 +33,14 @@ function hub_exception_handler ($exceptionInstance) {
                        // Init argument string
                        $argsString = '';
 
-                       // Convert arguments type into human-readable
-                       foreach ($traceArray['args'] as $arg) {
-                               $argsString .= ', ' . gettype($arg);
-                       } // END - foreach
-                       $argsString = substr($argsString, 2);
+                       // Any arguments?
+                       if ((isset($traceArray['args'])) && (is_array($traceArray['args'])) && (count($traceArray['args']) > 0)) {
+                               // Convert arguments type into human-readable
+                               foreach ($traceArray['args'] as $arg) {
+                                       $argsString .= ', ' . gettype($arg);
+                               } // END - foreach
+                               $argsString = substr($argsString, 2);
+                       } // END - if
 
                        // Set missing file/line
                        if (!isset($traceArray['file']))  $traceArray['file']  = 'unknown';
@@ -84,9 +87,11 @@ Backtrace:
                // Output the message
                print($message);
        } else {
-               // Invalid exception instance detected! Do *only* throw exceptions that
-               // extends our own exception 'FrameworkException' to get such nice
-               // outputs like above.
+               /*
+                * Invalid exception instance detected! Do *only* throw exceptions that
+                * extends our own exception 'FrameworkException' to get such nice
+                * outputs like above.
+                */
                print('exceptionInstance[]=' . gettype($exceptionInstance) . ' is invalid! Please inform the core developer team.');
        }
 }
@@ -119,6 +124,10 @@ function __assertHandler ($file, $line, $code) {
                $code
        );
 
+       // Log assert
+       die($message . PHP_EOL);
+       syslog(LOG_WARNING, $message);
+
        // Throw an exception here
        throw new AssertionException($message, BaseFrameworkSystem::EXCEPTION_ASSERTION_FAILED);
 } // END - function
@@ -126,15 +135,17 @@ function __assertHandler ($file, $line, $code) {
 // Set error handler
 //set_error_handler('__errorHandler');
 
-// Set the new handler
+// Set the exception handler
 set_exception_handler('hub_exception_handler');
 
 // Init assert handling
-assert_options(ASSERT_ACTIVE,     true);
-assert_options(ASSERT_WARNING,    false);
-assert_options(ASSERT_BAIL,       false);
-assert_options(ASSERT_QUIET_EVAL, false);
-assert_options(ASSERT_CALLBACK,   '__assertHandler');
+assert_options(ASSERT_ACTIVE    , TRUE);
+assert_options(ASSERT_WARNING   , FALSE);
+assert_options(ASSERT_BAIL      , TRUE);
+assert_options(ASSERT_QUIET_EVAL, FALSE);
+
+// Set assertion handler
+assert_options(ASSERT_CALLBACK  , '__assertHandler');
 
 // [EOF]
 ?>