改用redis来做队列的存储

tourze · Dec 6, 2016 · 0aa5756 · 0aa5756
1 parent 560bf46
commit 0aa5756
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 145 deletions.
diff --git a/README.md b/README.md
@@ -93,10 +93,6 @@ return [
             'bootstrapRefresh' => [
                 'xxx\backend\Bootstrap',
             ],
-            'global' => [
-                'host' => '127.0.0.1',
-                'port' => 6676,
-            ],
             'server' => [
                 'host' => '127.0.0.1',
                 'port' => 6677,

diff --git a/composer.json b/composer.json
@@ -10,7 +10,6 @@
   "require": {
     "php": ">=5.6.0",
     "workerman/workerman": "^3.3.4",
-    "workerman/globaldata": "^1.0",
     "yiisoft/yii2": "^2.0",
     "yiisoft/yii2-bootstrap": "~2.0.0",
     "yiisoft/yii2-swiftmailer": "~2.0.0",

diff --git a/demo/controllers/ApiController.php b/demo/controllers/ApiController.php
@@ -50,7 +50,8 @@ public function actionGetUsers()
     public function actionTask()
     {
         //Task::pushTask("var_dump", [time()]);
-        Task::pushTask("time");
+        //Task::pushTask("time");
+        Task::pushTask('sleep', [10]);
         return time();
     }
 }
diff --git a/demo/index.php b/demo/index.php
@@ -7,8 +7,6 @@
 require_once __DIR__ . '/../vendor/yiisoft/yii2/Yii.php';
 
 Yii::$app->params['workermanHttp']['demo'] = [
-    'host' => '127.0.0.1',
-    'port' => '6688',
     'root' => __DIR__,
     'debug' => false,
     // bootstrap文件, 只会引入一次
@@ -21,10 +19,6 @@
     ],
     // 有一些模块比较特殊, 无法实现Refreshable接口, 此时唯有在这里指定他的类名
     'bootstrapRefresh' => [],
-    'global' => [
-        'host' => '127.0.0.1',
-        'port' => 6676,
-    ],
     'server' => [
         'host' => '127.0.0.1',
         'port' => 6677,
@@ -35,7 +29,7 @@
     'task' => [
         'host' => '127.0.0.1',
         'port' => 6678,
-        'count' => 20,
+        'count' => 1,
         'name' => 'demo-task',
     ],
 ];

diff --git a/src/Application.php b/src/Application.php
@@ -2,7 +2,6 @@
 
 namespace tourze\workerman\yii2;
 
-use tourze\workerman\yii2\globalData\Client;
 use tourze\workerman\yii2\web\ErrorHandler;
 use tourze\workerman\yii2\web\Request;
 use tourze\workerman\yii2\web\Response;
@@ -56,11 +55,6 @@ public static function getGlobalConfig()
      */
     public static $workerApp = null;
 
-    /**
-     * @var Client
-     */
-    public static $globalData = null;
-
     /**
      * @var Worker 当前运行中的服务器实例
      */

diff --git a/src/async/Task.php b/src/async/Task.php
@@ -2,7 +2,8 @@
 
 namespace tourze\workerman\yii2\async;
 
-use tourze\workerman\yii2\Application;
+use Yii;
+use yii\redis\Connection;
 
 /**
  * 使用
@@ -22,6 +23,14 @@ class Task
      */
     public static $taskCountKey = 'task_count';
 
+    /**
+     * @return Connection
+     */
+    public static function getRedis()
+    {
+        return Yii::$app->get('redis');
+    }
+
     /**
      * 打包数据
      *
@@ -56,13 +65,9 @@ public static function unpackData($data)
      */
     public static function pushTask($function, $params = [])
     {
-        if ( ! Application::$globalData)
-        {
-            return 0;
-        }
         $data = self::packData($function, $params);
-        Application::$globalData->push(self::$taskQueueKey, $data);
-        $taskId = Application::$globalData->increment(self::$taskCountKey);
+        self::getRedis()->rpush(self::$taskQueueKey, $data);
+        $taskId = self::getRedis()->incr(self::$taskCountKey);
         return $taskId;
     }
 
@@ -73,20 +78,17 @@ public static function pushTask($function, $params = [])
      */
     public static function popTask()
     {
-        if ( ! Application::$globalData)
-        {
-            return '';
-        }
-        return Application::$globalData->pop(self::$taskQueueKey);
+        return self::getRedis()->lpop(self::$taskQueueKey);
     }
 
     /**
      * 执行任务
      *
      * @param string $data
+     * @param int $taskId
      * @return mixed
      */
-    public static function runTask($data)
+    public static function runTask($data, $taskId = null)
     {
         $data = self::unpackData($data);
         $function = array_shift($data);

diff --git a/src/globalData/Client.php b/src/globalData/Client.php
diff --git a/src/globalData/Server.php b/src/globalData/Server.php
diff --git a/src/server/GlobalServer.php b/src/server/GlobalServer.php
diff --git a/src/server/Server.php b/src/server/Server.php
@@ -5,7 +5,6 @@
 use tourze\workerman\yii2\Application;
 use tourze\workerman\yii2\async\Task;
 use tourze\workerman\yii2\Container;
-use tourze\workerman\yii2\globalData\Client;
 use tourze\workerman\yii2\log\Logger;
 use Workerman\Worker;
 use Yii;
@@ -156,31 +155,6 @@ public static function loadBootstrapFile($bootstrapFile)
         }
     }
 
-    /**
-     * 运行全局数据共享服务器
-     *
-     * @param array $config
-     * @param bool $isDebug
-     */
-    public static function runAppGlobalData($config, $isDebug)
-    {
-        $globalConfig = (array) ArrayHelper::getValue($config, 'global');
-        if ($globalConfig)
-        {
-            $host = ArrayHelper::getValue($globalConfig, 'host', '127.0.0.1');
-            $port = ArrayHelper::getValue($globalConfig, 'port', 6676);
-            unset($globalConfig['host'], $globalConfig['port']);
-            $task = new GlobalServer([
-                'app' => Application::$workerApp,
-                'host' => $host,
-                'port' => $port,
-                'debug' => $isDebug,
-            ]);
-            $task->run($globalConfig);
-            Application::$globalData = new Client("{$host}:{$port}");
-        }
-    }
-
     /**
      * 运行HTTP服务器
      *
@@ -255,10 +229,6 @@ final public static function runApp($app)
         $isDebug = ArrayHelper::getValue($config, 'debug', false);
 
         $root = ArrayHelper::getValue($config, 'root');
-        $host = ArrayHelper::getValue($config, 'host');
-
-        // 全局数据
-        self::runAppGlobalData($config, $isDebug);
 
         // 执行 HTTP SERVER
         self::runAppHttpServer($config, $root, $isDebug);