3.3.0-dev Task 大重构

454592673 · Aug 15, 2019 · f89579d · f89579d
1 parent 6331402
commit f89579d
Show file tree

Hide file tree

Showing 15 changed files with 53 additions and 271 deletions.
diff --git a/composer.json b/composer.json
@@ -21,7 +21,8 @@
         "jeremeamia/superclosure": "^2.4",
         "easyswoole/trigger": "^1.0",
         "dragonmantank/cron-expression": "^2.2",
-        "easyswoole/config": "^1.0"
+        "easyswoole/config": "^1.0",
+        "easyswoole/task": "^1.0"
     },
     "autoload": {
         "psr-4": {

diff --git a/src/Core.php b/src/Core.php
@@ -15,20 +15,18 @@
 use EasySwoole\EasySwoole\Crontab\Crontab;
 use EasySwoole\EasySwoole\Swoole\EventHelper;
 use EasySwoole\EasySwoole\Swoole\EventRegister;
-use EasySwoole\EasySwoole\Swoole\Task\QuickTaskInterface;
+use EasySwoole\EasySwoole\Task\TaskManager;
 use EasySwoole\Http\Dispatcher;
 use EasySwoole\Http\Message\Status;
 use EasySwoole\Http\Request;
 use EasySwoole\Http\Response;
-use EasySwoole\EasySwoole\Swoole\Task\AbstractAsyncTask;
-use EasySwoole\EasySwoole\Swoole\Task\SuperClosure;
 use EasySwoole\Log\LoggerInterface;
 use EasySwoole\Trigger\Location;
 use EasySwoole\Trigger\TriggerInterface;
 use EasySwoole\Utility\File;
-use Swoole\Server\Task;
 use EasySwoole\Log\Logger as DefaultLogger;
 use EasySwoole\Trigger\Trigger as DefaultTrigger;
+use EasySwoole\Task\Config as TaskConfig;
 
 ////////////////////////////////////////////////////////////////////
 //                          _ooOoo_                               //
@@ -266,53 +264,6 @@ private function registerDefaultCallBack(\swoole_server $server,int $serverType)
                 $response_psr->__response();
             });
         }
-        EventHelper::on($server,EventRegister::onTask,function (\swoole_server $server, Task $task){
-            $finishData = null;
-            $taskObj = $task->data;
-            if(is_string($taskObj) && class_exists($taskObj)){
-                $ref = new \ReflectionClass($taskObj);
-                if($ref->implementsInterface(QuickTaskInterface::class)){
-                    try{
-                        $finishData = $taskObj::run($server,$task->id,$task->worker_id,$task->flags);
-                    }catch (\Throwable $throwable){
-                        Trigger::getInstance()->throwable($throwable);
-                    }
-                    goto finish;
-                }else if($ref->isSubclassOf(AbstractAsyncTask::class)){
-                    $taskObj = new $taskObj;
-                }
-            }
-            if($taskObj instanceof AbstractAsyncTask){
-                try{
-                    $ret = $taskObj->__onTaskHook($task->id,$task->worker_id,$task->flags);
-                    $finishData = $taskObj->__onFinishHook($ret,$task->id);
-                }catch (\Throwable $throwable){
-                    Trigger::getInstance()->throwable($throwable);
-                }
-            }else if($taskObj instanceof SuperClosure){
-                try{
-                    $finishData = $taskObj( $server, $task->id,$task->worker_id,$task->flags);
-                }catch (\Throwable $throwable){
-                    Trigger::getInstance()->throwable($throwable);
-                }
-            }else if(is_callable($taskObj)){
-                try{
-                    $finishData =  call_user_func($taskObj,$server,$task->id,$task->worker_id,$task->flags);
-                }catch (\Throwable $throwable){
-                    Trigger::getInstance()->throwable($throwable);
-                }
-            }
-            finish :{
-                //禁止 process执行回调
-                if(($server->setting['worker_num'] + $server->setting['task_worker_num']) > $task->worker_id){
-                    $task->finish($finishData);
-                }
-            }
-        });
-
-        EventHelper::on($server,EventRegister::onFinish,function (\swoole_server $serv, int $task_id,$data){
-            return $data;
-        });
 
         //注册默认的worker start
         EventHelper::registerWithAdd(ServerManager::getInstance()->getMainEventRegister(),EventRegister::onWorkerStart,function (\swoole_server $server,$workerId){
@@ -343,5 +294,14 @@ private function extraHandler()
     {
         //注册crontab进程
         Crontab::getInstance()->__run();
+        //注册Task进程
+        $config = Config::getInstance()->getConf('MAIN_SERVER.TASK');
+        $config = new TaskConfig($config);
+        $config->setTempDir(EASYSWOOLE_TEMP_DIR);
+        $config->setServerName(Config::getInstance()->getConf('SERVER_NAME'));
+        $config->setOnException(function (\Throwable $throwable){
+            Trigger::getInstance()->throwable($throwable);
+        });
+        TaskManager::getInstance($config)->attachToServer(ServerManager::getInstance()->getSwooleServer());
     }
 }
diff --git a/src/Crontab/AbstractCronTask.php b/src/Crontab/AbstractCronTask.php
@@ -8,10 +8,9 @@
 
 namespace EasySwoole\EasySwoole\Crontab;
 
+use EasySwoole\Task\AbstractInterface\TaskInterface;
 
-use EasySwoole\EasySwoole\Swoole\Task\QuickTaskInterface;
-
-abstract class AbstractCronTask implements QuickTaskInterface
+abstract class AbstractCronTask implements TaskInterface
 {
     abstract public static function getRule():string ;
     abstract public static function getTaskName():string ;

diff --git a/src/Crontab/CronRunner.php b/src/Crontab/CronRunner.php
@@ -11,8 +11,8 @@
 use Cron\CronExpression;
 use EasySwoole\Component\TableManager;
 use EasySwoole\Component\Timer;
-use EasySwoole\EasySwoole\Swoole\Task\TaskManager;
 use EasySwoole\Component\Process\AbstractProcess;
+use EasySwoole\EasySwoole\Task\TaskManager;
 
 class CronRunner extends AbstractProcess
 {
@@ -50,7 +50,7 @@ private function cronProcess()
                     $table = TableManager::getInstance()->get(Crontab::$__swooleTableName);
                     $table->incr($taskName, 'taskRunTimes', 1);
                     $table->set($taskName, ['taskNextRunTime' => $nextRunTime->getTimestamp()]);
-                    TaskManager::processAsync($this->tasks[$taskName]);
+                    TaskManager::getInstance()->async($this->tasks[$taskName]);
                 });
             }
         }

diff --git a/src/Crontab/Exception/CronTaskNotExist.php b/src/Crontab/Exception/CronTaskNotExist.php
@@ -15,7 +15,7 @@
  * Class CronTaskNotExist
  * @package EasySwoole\EasySwoole\Crontab
  */
-class CronTaskNotExist extends \Exception
+class CronTaskNotExist extends Exception
 {
     protected $taskName;
 

diff --git a/src/Crontab/Exception/CronTaskRuleInvalid.php b/src/Crontab/Exception/CronTaskRuleInvalid.php
@@ -10,7 +10,7 @@
 
 use Throwable;
 
-class CronTaskRuleInvalid extends CrontabException
+class CronTaskRuleInvalid extends Exception
 {
     protected $taskName;
     protected $taskRule;

diff --git a/src/Crontab/Exception/CrontabException.php b/src/Crontab/Exception/CrontabException.php
diff --git a/src/Crontab/Exception/Exception.php b/src/Crontab/Exception/Exception.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: eValor
+ * Date: 2018-11-23
+ * Time: 13:27
+ */
+
+namespace EasySwoole\EasySwoole\Crontab\Exception;
+
+
+class Exception extends \Exception
+{
+
+}
diff --git a/src/Resource/Config.tpl b/src/Resource/Config.tpl
@@ -16,11 +16,15 @@ return [
         'RUN_MODEL' => SWOOLE_PROCESS,
         'SETTING' => [
             'worker_num' => 8,
-            'task_worker_num' => 8,
             'reload_async' => true,
             'task_enable_coroutine' => true,
             'max_wait_time'=>3
         ],
+        'TASK'=>[
+            'workerNum'=>4,
+            'maxRunningNum'=>128,
+            'timeout'=>15
+        ]
     ],
     'TEMP_DIR' => null,
     'LOG_DIR' => null

diff --git a/src/Swoole/Task/AbstractAsyncTask.php b/src/Swoole/Task/AbstractAsyncTask.php
diff --git a/src/Swoole/Task/QuickTaskInterface.php b/src/Swoole/Task/QuickTaskInterface.php
diff --git a/src/Swoole/Task/SuperClosure.php b/src/Swoole/Task/SuperClosure.php