Added $app parameter to logException
This commit is contained in:
parent
42c58220de
commit
c4dee281e6
|
@ -30,7 +30,7 @@ try {
|
||||||
OC::handleRequest();
|
OC::handleRequest();
|
||||||
|
|
||||||
} catch (Exception $ex) {
|
} catch (Exception $ex) {
|
||||||
\OCP\Util::logException($ex);
|
\OCP\Util::logException('index', $ex);
|
||||||
|
|
||||||
//show the user a detailed error page
|
//show the user a detailed error page
|
||||||
OC_Response::setStatus(OC_Response::STATUS_INTERNAL_SERVER_ERROR);
|
OC_Response::setStatus(OC_Response::STATUS_INTERNAL_SERVER_ERROR);
|
||||||
|
|
|
@ -82,19 +82,19 @@ class Util {
|
||||||
* if DEBUG mode is enabled
|
* if DEBUG mode is enabled
|
||||||
* @param Exception $ex exception to log
|
* @param Exception $ex exception to log
|
||||||
*/
|
*/
|
||||||
public static function logException( \Exception $ex ) {
|
public static function logException( $app, \Exception $ex ) {
|
||||||
$message = $ex->getMessage();
|
$message = $ex->getMessage();
|
||||||
if ($ex->getCode()) {
|
if ($ex->getCode()) {
|
||||||
$message .= ' [' . $ex->getCode() . ']';
|
$message .= ' [' . $ex->getCode() . ']';
|
||||||
}
|
}
|
||||||
\OCP\Util::writeLog('index', 'Exception: ' . $message, \OCP\Util::FATAL);
|
\OCP\Util::writeLog($app, 'Exception: ' . $message, \OCP\Util::FATAL);
|
||||||
if (defined('DEBUG') and DEBUG) {
|
if (defined('DEBUG') and DEBUG) {
|
||||||
// also log stack trace
|
// also log stack trace
|
||||||
$stack = explode('#', $ex->getTraceAsString());
|
$stack = explode('#', $ex->getTraceAsString());
|
||||||
// first element is empty
|
// first element is empty
|
||||||
array_shift($stack);
|
array_shift($stack);
|
||||||
foreach ($stack as $s) {
|
foreach ($stack as $s) {
|
||||||
\OCP\Util::writeLog('index', 'Exception: ' . $s, \OCP\Util::FATAL);
|
\OCP\Util::writeLog($app, 'Exception: ' . $s, \OCP\Util::FATAL);
|
||||||
}
|
}
|
||||||
|
|
||||||
// include cause
|
// include cause
|
||||||
|
@ -105,7 +105,7 @@ class Util {
|
||||||
if ($ex->getCode()) {
|
if ($ex->getCode()) {
|
||||||
$message .= '[' . $ex->getCode() . '] ';
|
$message .= '[' . $ex->getCode() . '] ';
|
||||||
}
|
}
|
||||||
\OCP\Util::writeLog('index', 'Exception: ' . $message, \OCP\Util::FATAL);
|
\OCP\Util::writeLog($app, 'Exception: ' . $message, \OCP\Util::FATAL);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue