Merge pull request #15 from uniondrug/2.x

2.x
uniondrug · May 28, 2018 · bbdd394 · bbdd394
2 parents efbcb9a + 996515f
commit bbdd394
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/src/Application.php b/src/Application.php
@@ -18,6 +18,7 @@
 use Uniondrug\Framework\Container;
 use Uniondrug\Http\Response;
 use Uniondrug\Server\Task\Dispatcher;
+use Uniondrug\Server\Utils\Connections;
 
 /**
  * Class Application.
@@ -127,6 +128,9 @@ protected function registerExceptionHandler()
      */
     public function handleRequest(ServerRequestInterface $request)
     {
+        // 处理业务前检测数据库连接，自动重连
+        Connections::testConnections();
+
         try {
             // 将PSR规范的HTTP请求放入容器，为了兼容处理
             $this->setShared('PsrRequest', $request);

diff --git a/src/Process.php b/src/Process.php
@@ -77,9 +77,13 @@ public function checkParent()
         if (function_exists('posix_getppid')) {
             $parentPid = posix_getppid();
             if ($parentPid == 1) {
+                console()->debug('[checkParent] 父进程已经退出');
+
                 return false;
             } else {
-                if (!swoole_process::kill($parentPid, 0)) {
+                if (!posix_kill($parentPid, 0)) {
+                    console()->debug('[checkParent] 父进程已经不存在');
+
                     return false;
                 }
             }

diff --git a/src/Servitization/OnTaskTrait.php b/src/Servitization/OnTaskTrait.php
@@ -9,6 +9,7 @@
 use swoole_server;
 use Uniondrug\Packet\Json;
 use Uniondrug\Server\Task\TaskHandler;
+use Uniondrug\Server\Utils\Connections;
 
 trait OnTaskTrait
 {
@@ -18,6 +19,10 @@ trait OnTaskTrait
     public function doTask(swoole_server $server, $data, $taskId, $workerId)
     {
         console()->debug("[Task] doTask: fromWorkerId=%d, taskId=%d, data=%s", $workerId, $taskId, $data);
+
+        // 测试数据库连接
+        Connections::testConnections();
+
         try {
             $task = Json::decode($data, true);
             if ($task && isset($task['handler']) && is_a($task['handler'], TaskHandler::class, true)) {