diff --git a/Database/Base/BaseActiveRecord.php b/Database/Base/BaseActiveRecord.php index abe7d0d0..814a4a2f 100644 --- a/Database/Base/BaseActiveRecord.php +++ b/Database/Base/BaseActiveRecord.php @@ -407,7 +407,7 @@ abstract class BaseActiveRecord extends Component implements IOrm, ArrayAccess $lastId = $this->refresh(); } catch (\Throwable $exception) { $trance->rollback(); - $lastId = $this->addError($exception->getMessage(), 'mysql'); + $lastId = $this->addError($exception, 'mysql'); } return $lastId; } diff --git a/Database/Pagination.php b/Database/Pagination.php index 51d7a49f..78c16d71 100644 --- a/Database/Pagination.php +++ b/Database/Pagination.php @@ -179,7 +179,7 @@ class Pagination extends Component try { call_user_func($callback, $data, $param); } catch (\Throwable $exception) { - $this->addError($exception->getMessage()); + $this->addError($exception); } finally { $event = Snowflake::app()->getEvent(); $event->trigger(Event::SYSTEM_RESOURCE_RELEASES); diff --git a/HttpServer/Abstracts/Callback.php b/HttpServer/Abstracts/Callback.php index ee3145d1..f31ce805 100644 --- a/HttpServer/Abstracts/Callback.php +++ b/HttpServer/Abstracts/Callback.php @@ -48,7 +48,7 @@ abstract class Callback extends Application $event->offName(Event::SYSTEM_RESOURCE_RELEASES); $this->eventNotify($message, $event); } catch (\Throwable $exception) { - $this->error($exception->getMessage()); + $this->addError($exception); } } @@ -132,7 +132,7 @@ abstract class Callback extends Application $mail->AltBody = $message; $mail->send(); } catch (\Throwable $e) { - $this->addError($e->getMessage(), 'email'); + $this->addError($e, 'email'); } } diff --git a/HttpServer/Events/OnHandshake.php b/HttpServer/Events/OnHandshake.php index 861844f5..3a9b8d88 100644 --- a/HttpServer/Events/OnHandshake.php +++ b/HttpServer/Events/OnHandshake.php @@ -112,7 +112,7 @@ class OnHandshake extends Callback } return $node->dispatch($request, $response); } catch (\Throwable $exception) { - $this->addError($exception->getMessage() . ' ' . $exception->getFile() . ' ' . $exception->getLine()); + $this->addError($exception); return $this->disconnect($response, 500); } } diff --git a/HttpServer/Events/OnMessage.php b/HttpServer/Events/OnMessage.php index fcef5a05..436ffc96 100644 --- a/HttpServer/Events/OnMessage.php +++ b/HttpServer/Events/OnMessage.php @@ -37,7 +37,7 @@ class OnMessage extends Callback } } } catch (\Throwable $exception) { - $this->addError($exception->getMessage(), 'websocket'); + $this->addError($exception, 'websocket'); $server->send($frame->fd, $exception->getMessage()); } finally { fire(Event::SYSTEM_RESOURCE_RELEASES); diff --git a/HttpServer/Route/Node.php b/HttpServer/Route/Node.php index 54facd82..535889d6 100644 --- a/HttpServer/Route/Node.php +++ b/HttpServer/Route/Node.php @@ -212,7 +212,7 @@ class Node extends Application return [$reflect->newInstance(), $action]; } catch (Throwable $exception) { $this->_error = $exception->getMessage(); - $this->error($exception->getMessage(), 'router'); + $this->error($exception, 'router'); return null; } } diff --git a/HttpServer/Route/Router.php b/HttpServer/Route/Router.php index f72334ff..827250df 100644 --- a/HttpServer/Route/Router.php +++ b/HttpServer/Route/Router.php @@ -610,7 +610,7 @@ class Router extends Application implements RouterInterface $router = $this; include_once "{$files}"; } catch (\Throwable $exception) { - $this->error($exception->getMessage()); + $this->error($exception); } finally { if (isset($exception)) { unset($exception); diff --git a/Kafka/Kafka.php b/Kafka/Kafka.php index 2fcc8bf7..4e8208fe 100644 --- a/Kafka/Kafka.php +++ b/Kafka/Kafka.php @@ -69,7 +69,7 @@ class Kafka extends \Snowflake\Process\Process $this->resolve($topic, $conf['interval'] ?? 1000); } while (true); } catch (Throwable $exception) { - $this->application->error($exception->getMessage()); + $this->application->error($exception); } } @@ -95,7 +95,7 @@ class Kafka extends \Snowflake\Process\Process $this->application->error($message->errstr()); } } catch (Throwable $exception) { - $this->application->error($exception->getMessage()); + $this->application->error($exception); } } @@ -155,7 +155,7 @@ class Kafka extends \Snowflake\Process\Process } $class->onHandler(new Struct($topic, $message)); } catch (Throwable $exception) { - $this->application->error($exception->getMessage()); + $this->application->error($exception); } }); } @@ -191,7 +191,7 @@ class Kafka extends \Snowflake\Process\Process return [$conf, $topicConf, $kafka]; } catch (Throwable $exception) { - $this->application->error($exception->getMessage()); + $this->application->error($exception); return [null, null, null]; } diff --git a/System/Error/ErrorHandler.php b/System/Error/ErrorHandler.php index 195418cb..d4db729f 100644 --- a/System/Error/ErrorHandler.php +++ b/System/Error/ErrorHandler.php @@ -122,7 +122,7 @@ class ErrorHandler extends Component implements ErrorInterface $data = Json::to($code, $this->category . ': ' . $message, $path); - Snowflake::app()->trance($data, $this->category); + logger()->trance($data, $this->category); return response()->send($data); } diff --git a/System/Event.php b/System/Event.php index bf8f828c..b6ece62d 100644 --- a/System/Event.php +++ b/System/Event.php @@ -217,7 +217,7 @@ class Event extends BaseObject } call_user_func($handler, ...$defaultParameter); } catch (\Throwable $exception) { - $this->error($exception->getMessage()); + $this->error($exception); } } if ($is_remove) { diff --git a/System/Pool/Redis.php b/System/Pool/Redis.php index 6ddf3707..76e72e6e 100644 --- a/System/Pool/Redis.php +++ b/System/Pool/Redis.php @@ -159,7 +159,7 @@ class Redis extends Pool $result = true; } } catch (\Throwable $exception) { - $this->error($exception->getMessage()); + $this->error($exception); $result = false; } finally { if (!$result) {