- 优化DB日志输出

- 优化IteratorResponse输出，支持Generator中获取到连接状态

Author: yunwuxin

src/concerns/InteractsWithHttp.php

@@ -2,6 +2,7 @@
 
 namespace think\swoole\concerns;
 
+use Generator;
 use Swoole\Coroutine;
 use Swoole\Coroutine\Http\Server;
 use Swoole\Http\Request;
@@ -255,9 +256,20 @@ protected function sendIterator(Response $res, IteratorResponse $response)
         $this->setHeader($res, $response->getHeader());
         $this->setStatus($res, $response->getCode());
 
-        foreach ($response as $content) {
-            $res->write($content);
+        $iterator = $response->getIterator();
+
+        if ($iterator instanceof Generator) {
+            while ($iterator->valid()) {
+                $content   = $iterator->current();
+                $connected = $res->write($content);
+                $iterator->send($connected);
+            }
+        } else {
+            foreach ($iterator as $content) {
+                $res->write($content);
+            }
         }
+
         $res->end();
     }
 
@@ -268,8 +280,8 @@ protected function sendFile(Response $res, \think\Request $request, FileResponse
         $code   = $response->getCode();
         $file   = $response->getFile();
 
-        $ifNoneMatch            = $request->header('If-None-Match');
-        $ifRange                = $request->header('If-Range');
+        $ifNoneMatch = $request->header('If-None-Match');
+        $ifRange     = $request->header('If-Range');
         $eTag         = $response->getHeader('ETag');
         $lastModified = $response->getHeader('Last-Modified');
 

src/concerns/WithApplication.php

@@ -4,6 +4,8 @@
 
 use Closure;
 use think\App;
+use think\Container;
+use think\Log;
 use think\swoole\App as SwooleApp;
 use think\swoole\Manager;
 use think\swoole\pool\Cache;
@@ -34,7 +36,9 @@ protected function prepareApplication(string $envName)
             if ($this->getConfig('pool.db.enable', true)) {
                 $this->app->bind('db', Db::class);
                 $this->app->resolving(Db::class, function (Db $db) {
-                    $db->setLog($this->container->log);
+                    $db->setLog(function ($type, $log) {
+                        Container::getInstance()->make(Log::class)->log($type, $log);
+                    });
                 });
             }
             if ($this->getConfig('pool.cache.enable', true)) {

src/ipc/driver/Redis.php

@@ -24,15 +24,6 @@ public function getType()
 
     public function prepare(\Swoole\Process\Pool $pool)
     {
-        $connector = new PhpRedisConnector();
-
-        $connection = $connector->connect($this->config);
-
-        if (count($keys = $connection->keys("{$this->getPrefix()}*"))) {
-            $connection->del($keys);
-        }
-
-        $connector->disconnect($connection);
     }
 
     public function subscribe()