add coWrite(); use swoft/swoole-ide-helper (#83)

* use swoft/swoole-ide-helper * add coWrite() * update
swoft-cloud · May 29, 2018 · 01ef3d0 · 01ef3d0
1 parent da53c72
commit 01ef3d0
Show file tree

Hide file tree

Showing 20 changed files with 30 additions and 52 deletions.
diff --git a/composer.json b/composer.json
@@ -23,7 +23,7 @@
         "text/template": "~2.3"
     },
     "require-dev": {
-        "eaglewu/swoole-ide-helper": "dev-master",
+        "swoft/swoole-ide-helper": "dev-master",
         "phpunit/phpunit": "^5.7",
         "friendsofphp/php-cs-fixer": "^2.10"
     },

diff --git a/src/console/composer.json b/src/console/composer.json
@@ -33,7 +33,7 @@
         }
     ],
     "require-dev": {
-        "eaglewu/swoole-ide-helper": "dev-master",
+        "swoft/swoole-ide-helper": "dev-master",
         "phpunit/phpunit": "^5.7"
     },
     "scripts": {

diff --git a/src/db/composer.json b/src/db/composer.json
@@ -26,7 +26,7 @@
         ]
     },
     "require-dev": {
-        "eaglewu/swoole-ide-helper": "dev-master",
+        "swoft/swoole-ide-helper": "dev-master",
         "phpunit/phpunit": "^5.7",
         "friendsofphp/php-cs-fixer": "^2.10"
     },

diff --git a/src/framework/composer.json b/src/framework/composer.json
@@ -30,7 +30,7 @@
         ]
     },
     "require-dev": {
-        "eaglewu/swoole-ide-helper": "dev-master",
+        "swoft/swoole-ide-helper": "dev-master",
         "phpunit/phpunit": "^5.7",
         "friendsofphp/php-cs-fixer": "^2.10"
     },

diff --git a/src/framework/src/Log/FileHandler.php b/src/framework/src/Log/FileHandler.php
@@ -4,6 +4,7 @@
 
 use Monolog\Handler\AbstractProcessingHandler;
 use Swoft\App;
+use Swoole\Coroutine;
 
 /**
  * 日志文件输出器
@@ -55,50 +56,27 @@ protected function write(array $records)
     {
         // 参数
         $this->createDir();
-        $isTask = App::isWorkerStatus();
         $logFile = App::getAlias($this->logFile);
         $messageText = implode("\n", $records) . "\n";
-
-        // 同步写
-        if ($isTask === false) {
-            return $this->syncWrite($logFile, $messageText);
-        }
-        // 异步写
-        $this->aysncWrite($logFile, $messageText);
-    }
-
-    /**
-     * 同步写文件
-     *
-     * @param string $logFile     日志路径
-     * @param string $messageText 文本信息
-     */
-    private function syncWrite(string $logFile, string $messageText)
-    {
-        $fp = fopen($logFile, 'a');
-        if ($fp === false) {
-            throw new \InvalidArgumentException("Unable to append to log file: {$this->logFile}");
-        }
-        flock($fp, LOCK_EX);
-        fwrite($fp, $messageText);
-        flock($fp, LOCK_UN);
-        fclose($fp);
+
+        // 协程写
+        $this->coWrite($logFile, $messageText);
     }
 
     /**
-     * 异步写文件
+     * 协程写文件
      *
      * @param string $logFile     日志路径
      * @param string $messageText 文本信息
      */
-    private function aysncWrite(string $logFile, string $messageText)
+    private function coWrite(string $logFile, string $messageText)
     {
-        while (true) {
-            $result = \Swoole\Async::writeFile($logFile, $messageText, null, FILE_APPEND);
-            if ($result == true) {
-                break;
+        go(function () use ($logFile, $messageText) {
+            $res = Coroutine::writeFile($logFile, $messageText, FILE_APPEND);
+            if ($res === false) {
+                throw new \InvalidArgumentException("Unable to append to log file: {$this->logFile}");
             }
-        }
+        });
     }
 
     /**

diff --git a/src/http-client/composer.json b/src/http-client/composer.json
@@ -16,7 +16,7 @@
         "swoft/framework": "^1.0"
     },
     "require-dev": {
-        "eaglewu/swoole-ide-helper": "dev-master",
+        "swoft/swoole-ide-helper": "dev-master",
         "phpunit/phpunit": "^5.7"
     },
     "autoload": {

diff --git a/src/http-message/composer.json b/src/http-message/composer.json
@@ -33,7 +33,7 @@
     }
   },
   "require-dev": {
-    "eaglewu/swoole-ide-helper": "dev-master",
+    "swoft/swoole-ide-helper": "dev-master",
     "phpunit/phpunit": "^5.7"
   },
   "scripts": {

diff --git a/src/http-server/composer.json b/src/http-server/composer.json
@@ -30,7 +30,7 @@
         }
     ],
     "require-dev": {
-        "eaglewu/swoole-ide-helper": "dev-master",
+        "swoft/swoole-ide-helper": "dev-master",
         "phpunit/phpunit": "^5.7"
     },
     "scripts": {

diff --git a/src/i18n/composer.json b/src/i18n/composer.json
@@ -33,7 +33,7 @@
         }
     ],
     "require-dev": {
-        "eaglewu/swoole-ide-helper": "dev-master",
+        "swoft/swoole-ide-helper": "dev-master",
         "phpunit/phpunit": "^5.7"
     },
     "scripts": {

diff --git a/src/memory/composer.json b/src/memory/composer.json
@@ -23,7 +23,7 @@
         }
     },
     "require-dev": {
-        "eaglewu/swoole-ide-helper": "dev-master",
+        "swoft/swoole-ide-helper": "dev-master",
         "phpunit/phpunit": "^5.7",
         "friendsofphp/php-cs-fixer": "^2.10"
     },

diff --git a/src/process/composer.json b/src/process/composer.json
@@ -34,7 +34,7 @@
         }
     ],
     "require-dev": {
-        "eaglewu/swoole-ide-helper": "dev-master",
+        "swoft/swoole-ide-helper": "dev-master",
         "phpunit/phpunit": "^5.7"
     },
     "scripts": {

diff --git a/src/queue/composer.json b/src/queue/composer.json
@@ -36,7 +36,7 @@
         }
     },
     "require-dev": {
-        "eaglewu/swoole-ide-helper": "dev-master",
+        "swoft/swoole-ide-helper": "dev-master",
         "phpunit/phpunit": "^5.7"
     },
     "scripts": {

diff --git a/src/redis/composer.json b/src/redis/composer.json
@@ -36,7 +36,7 @@
     ],
     "require-dev": {
         "swoft/service-governance": "^1.0",
-        "eaglewu/swoole-ide-helper": "dev-master",
+        "swoft/swoole-ide-helper": "dev-master",
         "phpunit/phpunit": "^5.7"
     },
     "scripts": {

diff --git a/src/rpc-client/composer.json b/src/rpc-client/composer.json
@@ -13,7 +13,7 @@
         "swoft/framework": "^1.0"
     },
     "require-dev": {
-        "eaglewu/swoole-ide-helper": "dev-master",
+        "swoft/swoole-ide-helper": "dev-master",
         "phpunit/phpunit": "^5.7"
     },
     "autoload": {

diff --git a/src/rpc-server/composer.json b/src/rpc-server/composer.json
@@ -16,7 +16,7 @@
         "psr/http-server-middleware": "^1.0"
     },
     "require-dev": {
-        "eaglewu/swoole-ide-helper": "dev-master",
+        "swoft/swoole-ide-helper": "dev-master",
         "phpunit/phpunit": "^5.7"
     },
     "autoload": {

diff --git a/src/rpc/composer.json b/src/rpc/composer.json
@@ -13,7 +13,7 @@
         "swoft/framework": "^1.0"
     },
     "require-dev": {
-        "eaglewu/swoole-ide-helper": "dev-master",
+        "swoft/swoole-ide-helper": "dev-master",
         "phpunit/phpunit": "^5.7"
     },
     "autoload": {

diff --git a/src/service-governance/composer.json b/src/service-governance/composer.json
@@ -13,7 +13,7 @@
         "swoft/framework": "^1.0"
     },
     "require-dev": {
-        "eaglewu/swoole-ide-helper": "dev-master",
+        "swoft/swoole-ide-helper": "dev-master",
         "phpunit/phpunit": "^5.7"
     },
     "autoload": {

diff --git a/src/task/composer.json b/src/task/composer.json
@@ -15,7 +15,7 @@
     },
     "require-dev": {
         "swoft/process": "^1.0",
-        "eaglewu/swoole-ide-helper": "dev-master",
+        "swoft/swoole-ide-helper": "dev-master",
         "phpunit/phpunit": "^5.7"
     },
     "autoload": {

diff --git a/src/trace/composer.json b/src/trace/composer.json
@@ -20,7 +20,7 @@
         }
     },
     "require-dev": {
-        "eaglewu/swoole-ide-helper": "dev-master",
+        "swoft/swoole-ide-helper": "dev-master",
         "phpunit/phpunit": "^5.7",
         "friendsofphp/php-cs-fixer": "^2.10"
     },

diff --git a/src/view/composer.json b/src/view/composer.json
@@ -32,7 +32,7 @@
         }
     ],
     "require-dev": {
-        "eaglewu/swoole-ide-helper": "dev-master",
+        "swoft/swoole-ide-helper": "dev-master",
         "phpunit/phpunit": "^5.7"
     },
     "scripts": {