mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Simply use logException() to log the exception - no need for custom code

This commit is contained in:
Thomas Müller 2016-01-11 12:26:04 +01:00
parent fa75866879
commit e7038a2736
1 changed files with 11 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
lib/private/hook.php
View File

@ -56,7 +56,7 @@ class OC_Hook{
self::$registered[$signalClass][$signalName] = array();
}
// dont connect hooks twice
// don't connect hooks twice
foreach (self::$registered[$signalClass][$signalName] as $hook) {
if ($hook['class'] === $slotClass and $hook['name'] === $slotName) {
return false;
@ -79,8 +79,8 @@ class OC_Hook{
* @param string $signalName name of signal
* @param mixed $params default: array() array with additional data
* @return bool true if slots exists or false if not
* @throws \OC\ServerNotAvailableException
* Emits a signal. To get data from the slot use references!
* @throws \OC\HintException
* @throws \OC\ServerNotAvailableException Emits a signal. To get data from the slot use references!
*
* TODO: write example
*/
@ -104,41 +104,30 @@ class OC_Hook{
call_user_func( array( $i["class"], $i["name"] ), $params );
} catch (Exception $e){
self::$thrownExceptions[] = $e;
$class = $i["class"];
if (is_object($i["class"])) {
$class = get_class($i["class"]);
}
$message = $e->getMessage();
if (empty($message)) {
$message = get_class($e);
}
\OC::$server->getLogger()->logException($e);
if($e instanceof \OC\HintException) {
throw $e;
}
\OCP\Util::writeLog('hook',
'error while running hook (' . $class . '::' . $i["name"] . '): ' . $message,
\OCP\Util::ERROR);
if($e instanceof \OC\ServerNotAvailableException) {
throw $e;
}
}
}
// return true
return true;
}
/**
* clear hooks
* @param string $signalclass
* @param string $signalname
* @param string $signalClass
* @param string $signalName
*/
static public function clear($signalclass='', $signalname='') {
if($signalclass) {
if($signalname) {
self::$registered[$signalclass][$signalname]=array();
static public function clear($signalClass='', $signalName='') {
if ($signalClass) {
if ($signalName) {
self::$registered[$signalClass][$signalName]=array();
}else{
self::$registered[$signalclass]=array();
self::$registered[$signalClass]=array();
}
}else{
self::$registered=array();