feat：optimize worker daemon code

bingcool · Jun 1, 2024 · 6345b96 · 6345b96
1 parent cada953
commit 6345b96
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 16 deletions.
diff --git a/Test/WorkerDaemon/PipeWorkerProcess.php b/Test/WorkerDaemon/PipeWorkerProcess.php
@@ -24,7 +24,7 @@ public function loopHandle()
 
             var_dump('start start');
             sleep(15);
-            var_dump("gggggggggggggggggggggggggg");
+            var_dump("end end end ");
     }
 
 //    public function run()

diff --git a/Test/WorkerDaemon/conf/pipe_conf.php b/Test/WorkerDaemon/conf/pipe_conf.php
@@ -4,9 +4,9 @@
     [
         'process_name' => 'test-pipe-worker',
         'handler' => \Test\WorkerDaemon\PipeWorkerProcess::class,
-        'worker_num' => 3, // 默认动态进程数量
+        'worker_num' => 1, // 默认动态进程数量
         'max_handle' => 100, //消费达到10000后reboot进程
-        'life_time'  => 60, // 每隔3600s重启进程
+        'life_time'  => '* * * * *', // 每隔3600s重启进程
         'limit_run_coroutine_num' => 10, //当前进程的实时协程数量，如果协程数量超过此设置的数量，则禁止继续消费队列处理业务，而是在等待
         'extend_data' => [],
         'args' => []

diff --git a/src/Worker/AbstractBaseWorker.php b/src/Worker/AbstractBaseWorker.php
@@ -1022,7 +1022,7 @@ public function isDue(): bool
     {
         if($this->isRebooting() || $this->isForceExit() || $this->isExiting() || $this->waitToExit) {
             sleep(1);
-            $this->fmtWriteInfo("Process Wait to Exit or Reboot");
+            $this->fmtWriteInfo("【{$this->getProcessName()}】Process Wait to Exit or Reboot，Do not something");
             return false;
         }
         return true;
@@ -1322,19 +1322,26 @@ protected function exitNow(int $pid, int $maxWaitTimeOfExit)
     /**
      * registerTickReboot register time reboot, will be called in init() function
      *
-     * @param int|string $lifeTime
      * @return void
      */
-    protected function registerTickReboot($lifeTime)
+    protected function registerTickReboot()
     {
         /**
          * local模式下的定时任务模式下不能设置定时重启，否则长时间执行的任务会被kill掉,而是在回调函数注册callback闭包来判断是否达到重启时间
          * @see \Swoolefy\Worker\Cron\CronLocalProcess
          */
         if (SystemEnv::isCronService() && $this instanceof \Swoolefy\Worker\Cron\CronLocalProcess) {
+            if (!is_numeric($this->lifeTime)) {
+                $this->lifeTime = 3600;
+            }else {
+                if ($this->lifeTime < 60) {
+                    $this->lifeTime = 60;
+                }
+            }
             return;
         }
 
+        $lifeTime = $this->lifeTime;
         // daemon下使用loopHandle模式，则不注册定时重启，会在业务处理完后重启
         if ($this->useLoopHandle && is_numeric($lifeTime)) {
             return;

diff --git a/src/Worker/AbstractWorkerProcess.php b/src/Worker/AbstractWorkerProcess.php
@@ -55,7 +55,7 @@ protected function init()
         $this->lifeTime                    = $this->getArgs()['life_time'] ?? $this->lifeTime;
         $this->currentRunCoroutineLastCid  = $this->getArgs()['current_run_coroutine_last_cid'] ?? $this->maxHandle * 10;
         $this->limitCurrentRunCoroutineNum = $this->getArgs()['limit_run_coroutine_num'] ?? null;
-        $this->registerTickReboot($this->lifeTime);
+        $this->registerTickReboot();
         $this->onInit();
     }
 
@@ -98,6 +98,7 @@ public function run()
             $this->useLoopHandle = true;
             while (true) {
                 if (!$this->isDue()) {
+                    $this->fmtWriteInfo("【{$this->getProcessName()}】守护进程退出|重启中，不再处理任务");
                     continue;
                 }
 

diff --git a/src/Worker/Cron/CronLocalProcess.php b/src/Worker/Cron/CronLocalProcess.php
@@ -68,7 +68,7 @@ function (): bool {
                     }
 
                     if (!$this->isDue()) {
-                        $this->fmtWriteInfo("【{$this->getProcessName()}】进程退出中，不再处理任务");
+                        $this->fmtWriteInfo("【{$this->getProcessName()}】定时任务进程退出|重启中，暂时不再处理任务");
                         return false;
                     }
 
@@ -84,16 +84,11 @@ function () {
                     }
 
                     // 定时任务处理完之后，判断达到一定时间，然后重启进程
-                    if (!is_numeric($this->lifeTime)) {
-                        $this->lifeTime = 3600;
-                    }else {
-                        if ($this->lifeTime < 60) {
-                            $this->lifeTime = 60;
+                    if (is_numeric($this->lifeTime)) {
+                        if ( (time() > $this->getStartTime() + $this->lifeTime) && $this->isDue()) {
+                            $this->reboot(5);
                         }
                     }
-                    if ( (time() > $this->getStartTime() + $this->lifeTime) && $this->isDue()) {
-                        $this->reboot(5);
-                    }
             });
         }catch (\Throwable $exception) {
             $this->onHandleException($exception, $this->getArgs());