as2252258/kiri-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

变更

Browse Source
This commit is contained in:
向林
2023-04-17 00:41:30 +08:00
parent 3b92bdb3ea
commit ac2f2654a3
1 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kiri-engine/Error/ErrorHandler.php
+11 -16
View File
@@ -33,18 +33,12 @@ class ErrorHandler extends Component implements ErrorInterface
* @var string * @var string
*/ */
public string $category = 'app'; public string $category = 'app';
/**
* @var EventDispatch
*/
#[Container(EventDispatch::class)]
public EventDispatch $dispatch;
/** /**
* @param array|Closure|null $callback * @param array|Closure|null $callback
* @return void * @return void
* @throws ReflectionException
*/ */
public function registerExceptionHandler(null|array|Closure $callback): void public function registerExceptionHandler(null|array|Closure $callback): void
{ {
@@ -55,11 +49,12 @@ class ErrorHandler extends Component implements ErrorInterface
} }
set_exception_handler($callback); set_exception_handler($callback);
} }
/** /**
* @param array|Closure|null $callback * @param array|Closure|null $callback
* @return void * @return void
* @throws ReflectionException
*/ */
public function registerErrorHandler(null|array|Closure $callback): void public function registerErrorHandler(null|array|Closure $callback): void
{ {
@@ -107,7 +102,7 @@ class ErrorHandler extends Component implements ErrorInterface
$message = array_shift($messages); $message = array_shift($messages);
$this->dispatch->dispatch(new Kiri\Events\OnSystemError()); Kiri::getDi()->get(EventDispatch::class)->dispatch(new Kiri\Events\OnSystemError());
$this->sendError($message, $lastError['file'], $lastError['line']); $this->sendError($message, $lastError['file'], $lastError['line']);
} }
@@ -123,8 +118,8 @@ class ErrorHandler extends Component implements ErrorInterface
public function exceptionHandler(\Throwable $exception) public function exceptionHandler(\Throwable $exception)
{ {
$this->category = 'exception'; $this->category = 'exception';
$this->dispatch->dispatch(new Kiri\Events\OnSystemError()); Kiri::getDi()->get(EventDispatch::class)->dispatch(new Kiri\Events\OnSystemError());
$this->sendError($exception->getMessage(), $exception->getFile(), $exception->getLine()); $this->sendError($exception->getMessage(), $exception->getFile(), $exception->getLine());
} }
@@ -149,8 +144,8 @@ class ErrorHandler extends Component implements ErrorInterface
$data = Json::jsonFail($error[1], 500, $path); $data = Json::jsonFail($error[1], 500, $path);
\Kiri::getLogger()->error('On error handler', [$data]); \Kiri::getLogger()->error('On error handler', [$data]);
$this->dispatch->dispatch(new Kiri\Events\OnSystemError()); Kiri::getDi()->get(EventDispatch::class)->dispatch(new Kiri\Events\OnSystemError());
throw new \ErrorException($error[1], $error[0], 1, $error[2], $error[3]); throw new \ErrorException($error[1], $error[0], 1, $error[2], $error[3]);
} }