This commit is contained in:
2020-11-06 16:47:17 +08:00
parent 0171e39c70
commit fa4b733ea3
11 changed files with 15 additions and 15 deletions
+2 -2
View File
@@ -41,7 +41,7 @@ abstract class Callback extends Application
$event->offName(Event::EVENT_AFTER_REQUEST);
$event->offName(Event::EVENT_BEFORE_REQUEST);
$this->eventNotify($message, $event);
} catch (Exception $exception) {
} catch (\Throwable $exception) {
$this->error($exception->getMessage());
}
}
@@ -125,7 +125,7 @@ abstract class Callback extends Application
$mail->Body = $message;
$mail->AltBody = $message;
$mail->send();
} catch (Exception $e) {
} catch (\Throwable $e) {
$this->addError($e->getMessage(), 'email');
}
}
+1 -1
View File
@@ -43,7 +43,7 @@ class OnMessage extends Callback
}
$events = $manager->getName(AWebsocket::MESSAGE, [null, null, $frame->data['route']]);
$manager->runWith($events, [$frame, $server]);
} catch (\Exception $exception) {
} catch (\Throwable $exception) {
$this->addError($exception->getMessage(), 'websocket');
$server->send($frame->fd, $exception->getMessage());
} finally {
+1 -1
View File
@@ -214,7 +214,7 @@ class Node extends Application
$annotation->read($this, $reflect, $action, $annotations);
}
return [$reflect->newInstance(), $action];
} catch (Exception $exception) {
} catch (\Throwable $exception) {
$this->_error = $exception->getMessage();
$this->error($exception->getMessage(), 'router');
return null;
+1 -1
View File
@@ -621,7 +621,7 @@ class Router extends Application implements RouterInterface
try {
$router = $this;
include_once "{$files}";
} catch (Exception $exception) {
} catch (\Throwable $exception) {
$this->error($exception->getMessage());
} finally {
if (isset($exception)) {