connection pool

windwalker-io · Aug 13, 2023 · 2a2c7aa · 2a2c7aa
1 parent aa7f96e
commit 2a2c7aa
Show file tree

Hide file tree

Showing 10 changed files with 133 additions and 40 deletions.
diff --git a/src/Core/Application/ApplicationInterface.php b/src/Core/Application/ApplicationInterface.php
@@ -12,6 +12,7 @@
 namespace Windwalker\Core\Application;
 
 use JetBrains\PhpStorm\NoReturn;
+use Psr\Log\LogLevel;
 use Windwalker\Core\Console\Process\ProcessRunnerInterface;
 use Windwalker\DI\Container;
 use Windwalker\Event\EventAwareInterface;
@@ -85,6 +86,8 @@ public function loadConfig(mixed $source, ?string $format = null, array $options
 
     public function addMessage(string|array $messages, ?string $type = 'info'): static;
 
+    public function log(string|\Stringable $message, array $context = [], string $level = LogLevel::INFO): static;
+
     /**
      * Close this request.
      *

diff --git a/src/Core/Application/ApplicationTrait.php b/src/Core/Application/ApplicationTrait.php
@@ -14,12 +14,12 @@
 use Closure;
 use OutOfRangeException;
 use Psr\EventDispatcher\EventDispatcherInterface;
+use Psr\Log\LoggerInterface;
 use ReflectionException;
 use Windwalker\Attributes\AttributesAccessor;
 use Windwalker\Core\Console\Process\ProcessRunnerTrait;
 use Windwalker\Core\Event\CoreEventAwareTrait;
 use Windwalker\Core\Event\EventDispatcherRegistry;
-use Windwalker\Core\Event\CoreEventEmitter;
 use Windwalker\Core\Runtime\Config;
 use Windwalker\Core\Runtime\Runtime;
 use Windwalker\Core\Utilities\Base64Url;
@@ -43,6 +43,8 @@ trait ApplicationTrait
     use CoreEventAwareTrait;
     use ProcessRunnerTrait;
 
+    public LoggerInterface $logger;
+
     /**
      * @var array<ServiceProviderInterface>
      */

diff --git a/src/Core/Application/WebApplication.php b/src/Core/Application/WebApplication.php
@@ -83,7 +83,7 @@ public function boot(): void
         // Start profiler for Web type
         $profilerFactory = null;
 
-        if ($this->getType() === 'web') {
+        if ($this->getType() === AppType::WEB) {
             $profilerFactory = new ProfilerFactory();
             $profilerFactory->get('main')->mark('boot', ['system']);
         }

diff --git a/src/Core/Application/WebApplicationTrait.php b/src/Core/Application/WebApplicationTrait.php
@@ -11,6 +11,11 @@
 
 namespace Windwalker\Core\Application;
 
+use Psr\Log\LoggerInterface;
+use Psr\Log\LogLevel;
+use Psr\Log\NullLogger;
+use Windwalker\Core\Manager\LoggerManager;
+
 /**
  * Trait WebApplicationTrait
  */
@@ -37,4 +42,30 @@ public function getClient(): AppClient
     {
         return AppClient::WEB;
     }
+
+    public function log(string|\Stringable $message, array $context = [], string $level = LogLevel::INFO): static
+    {
+        $this->logger ??= $this->getLogger();
+
+        $this->logger->log($level, $message, $context);
+
+        return $this;
+    }
+
+    private function getLogger(): LoggerInterface
+    {
+        $manager = $this->container->get(LoggerManager::class);
+
+        $name = 'web';
+
+        if ($this->isCliRuntime()) {
+            $name = 'cli-web';
+        }
+
+        if (!$manager->has($name)) {
+            return new NullLogger();
+        }
+
+        return $manager->get($name);
+    }
 }
diff --git a/src/Core/Console/ConsoleApplication.php b/src/Core/Console/ConsoleApplication.php
@@ -16,6 +16,9 @@
 use JetBrains\PhpStorm\NoReturn;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Message\UriInterface;
+use Psr\Log\LoggerInterface;
+use Psr\Log\LogLevel;
+use Psr\Log\NullLogger;
 use Symfony\Component\Console\Application as SymfonyApp;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\CommandLoader\ContainerCommandLoader;
@@ -37,6 +40,7 @@
 use Windwalker\Core\Events\Console\ConsoleLogEvent;
 use Windwalker\Core\Events\Console\ErrorMessageOutputEvent;
 use Windwalker\Core\Events\Console\MessageOutputEvent;
+use Windwalker\Core\Manager\LoggerManager;
 use Windwalker\Core\Provider\AppProvider;
 use Windwalker\Core\Provider\ConsoleProvider;
 use Windwalker\Core\Provider\WebProvider;
@@ -400,4 +404,24 @@ protected function bootProvidersBeforeRequest(Container $container)
             }
         }
     }
+
+    public function log(\Stringable|string $message, array $context = [], string $level = LogLevel::INFO): static
+    {
+        $this->logger ??= $this->getLogger();
+
+        $this->logger->log($level, $message, $context);
+
+        return $this;
+    }
+
+    protected function getLogger(): LoggerInterface
+    {
+        $manager = $this->container->get(LoggerManager::class);
+
+        if ($manager->has('console')) {
+            return $manager->get('console');
+        }
+
+        return new NullLogger();
+    }
 }
diff --git a/src/Core/Controller/DelegatingController.php b/src/Core/Controller/DelegatingController.php
@@ -113,7 +113,9 @@ public function execute(string $task, array $args = []): mixed
 
             return $nav->back();
         } catch (Throwable $e) {
-            $this->logError($e);
+            if ($this->app->isCliRuntime()) {
+                $this->logError($e);
+            }
 
             if (
                 $this->app->isDebug()
@@ -195,12 +197,12 @@ protected function logError(Throwable $e): void
             return;
         }
 
-        $message = ErrorLogHandler::handleExceptionLogText($e, $this->app->path('@root'));
+        // $message = ErrorLogHandler::handleExceptionLogText($e, $this->app->path('@root'));
 
         $this->app->service(LoggerService::class)
             ->error(
                 $this->app->config('error.log_channel') ?? 'error',
-                $message,
+                $e->getMessage(),
                 ['exception' => $e]
             );
     }

diff --git a/src/Core/Error/ErrorLogHandler.php b/src/Core/Error/ErrorLogHandler.php
@@ -77,11 +77,11 @@ public function __invoke(Throwable $e): void
         $code = $e->getCode();
 
         if ($code < 400 || $code >= 500) {
-            $message = static::handleExceptionLogText($e, $this->config->get('@root'));
+            // $message = static::handleExceptionLogText($e, $this->config->get('@root'));
 
             $this->logger->error(
                 $this->config->getDeep('error.log_channel') ?? 'error',
-                $message,
+                $e->getMessage(),
                 ['exception' => $e]
             );
         }

diff --git a/src/Core/Manager/DatabaseManager.php b/src/Core/Manager/DatabaseManager.php
@@ -11,10 +11,10 @@
 
 namespace Windwalker\Core\Manager;
 
-use RuntimeException;
 use Windwalker\Database\DatabaseAdapter;
 use Windwalker\Database\DatabaseFactory;
-use Windwalker\Database\Platform\AbstractPlatform;
+use Windwalker\Database\Platform\MySQLPlatform;
+use Windwalker\DI\Container;
 use Windwalker\ORM\ORM;
 
 /**
@@ -30,6 +30,17 @@ public function getConfigPrefix(): string
     }
 
     protected function getFactoryPath(string $name): string
+    {
+        $path =  'connections.' . $name . '.factory';
+
+        if (!$this->config->hasDeep($path)) {
+            $path =  'connections.' . $name;
+        }
+
+        return $path;
+    }
+
+    protected function getLegacyFactoryPath(string $name): string
     {
         return 'connections.' . $name;
     }
@@ -49,11 +60,19 @@ public function create(?string $name = null, ...$args): object
 
         $db->orm()->setAttributesResolver($this->container->getAttributesResolver());
 
-        if ($db->getPlatform()->getName() === AbstractPlatform::MYSQL) {
+        $platform = $db->getPlatform();
+
+        if ($platform instanceof MySQLPlatform && $platform->getName() === $platform::MYSQL) {
             $options = $db->getOptions();
 
-            if ($options['strict'] ?? true) {
-                $this->strictMode($db, $options);
+            try {
+                if ($options['strict'] ?? true) {
+                    $platform->enableStrictMode($options['modes'] ?? null);
+                } elseif ($options['modes'] ?? null) {
+                    $platform->setModes($options['modes'] ?? []);
+                }
+            } catch (\RuntimeException $e) {
+                // No actions
             }
         }
 
@@ -70,21 +89,27 @@ public function getDatabaseFactory(): DatabaseFactory
         return $this->container->resolve(DatabaseFactory::class);
     }
 
-    protected function strictMode(DatabaseAdapter $db, array $options): void
+    public static function createAdapter(string $instanceName): \Closure
     {
-        $modes = $options['modes'] ?? [
-                'ONLY_FULL_GROUP_BY',
-                'STRICT_TRANS_TABLES',
-                'ERROR_FOR_DIVISION_BY_ZERO',
-                'NO_ENGINE_SUBSTITUTION',
-                'NO_ZERO_IN_DATE',
-                'NO_ZERO_DATE',
-            ];
-
-        try {
-            $db->execute("SET @@SESSION.sql_mode = '" . implode(',', $modes) . "';");
-        } catch (RuntimeException $e) {
-            // If not success, hide error.
-        }
+        return function (Container $container) use ($instanceName) {
+            $factory = $container->newInstance(DatabaseFactory::class);
+            $connConfig = $container->getParam('database.connections.' . $instanceName);
+
+            $driverKey = 'database.connection.driver.' . $instanceName;
+
+            if ($container->has($driverKey)) {
+                $driver = $container->get($driverKey);
+
+                return $factory->create(
+                    $driver,
+                    $connConfig['options'] ?? [],
+                );
+            }
+
+            return $factory->create(
+                $connConfig['driver'],
+                $connConfig['options'] ?? [],
+            );
+        };
     }
 }
diff --git a/src/Core/Provider/MonologProvider.php b/src/Core/Provider/MonologProvider.php
@@ -48,20 +48,21 @@ public static function rotatingFileHandler(string $channel, ...$args): ObjectBui
     public static function logger(
         ?string $name = null,
         array $handlers = [],
-        array $processors = []
+        array $processors = [],
+        string $formatter = 'line_formatter'
     ): ObjectBuilderDefinition {
         return create(
-            static function (Container $container) use ($processors, $handlers, $name) {
+            static function (Container $container) use ($formatter, $processors, $handlers, $name) {
                 $logger = new Logger(
                     $name,
                     array_map(
-                        function ($handler) use ($container, $name) {
+                        static function ($handler) use ($formatter, $container, $name) {
                             /** @var HandlerInterface $handler */
                             $handler = $container->resolve($handler, ['instanceName' => $name]);
 
                             return $handler->setFormatter(
                                 $container->resolve(
-                                    $container->getParam('logs.factories.formatters.line_formatter')
+                                    $container->getParam('logs.factories.formatters.' . $formatter)
                                 )
                             );
                         },

diff --git a/src/Core/Service/LoggerService.php b/src/Core/Service/LoggerService.php
@@ -48,7 +48,7 @@ public function __construct(LoggerManager $manager)
      * @return static
      * @throws Exception
      */
-    public function emergency(string|array $channel, string|array $message, array $context = []): static
+    public function emergency(string|array $channel, mixed $message, array $context = []): static
     {
         $this->log($channel, LogLevel::EMERGENCY, $message, $context);
 
@@ -68,7 +68,7 @@ public function emergency(string|array $channel, string|array $message, array $c
      * @return static
      * @throws Exception
      */
-    public function alert(string|array $channel, string|array $message, array $context = []): static
+    public function alert(string|array $channel, mixed $message, array $context = []): static
     {
         $this->log($channel, LogLevel::ALERT, $message, $context);
 
@@ -87,7 +87,7 @@ public function alert(string|array $channel, string|array $message, array $conte
      * @return static
      * @throws Exception
      */
-    public function critical(string|array $channel, string|array $message, array $context = []): static
+    public function critical(string|array $channel, mixed $message, array $context = []): static
     {
         $this->log($channel, LogLevel::CRITICAL, $message, $context);
 
@@ -105,7 +105,7 @@ public function critical(string|array $channel, string|array $message, array $co
      * @return static
      * @throws Exception
      */
-    public function error(string|array $channel, string|array $message, array $context = []): static
+    public function error(string|array $channel, mixed $message, array $context = []): static
     {
         $this->log($channel, LogLevel::ERROR, $message, $context);
 
@@ -125,7 +125,7 @@ public function error(string|array $channel, string|array $message, array $conte
      * @return static
      * @throws Exception
      */
-    public function warning(string|array $channel, string|array $message, array $context = []): static
+    public function warning(string|array $channel, mixed $message, array $context = []): static
     {
         $this->log($channel, LogLevel::WARNING, $message, $context);
 
@@ -142,7 +142,7 @@ public function warning(string|array $channel, string|array $message, array $con
      * @return static
      * @throws Exception
      */
-    public function notice(string|array $channel, string|array $message, array $context = []): static
+    public function notice(string|array $channel, mixed $message, array $context = []): static
     {
         $this->log($channel, LogLevel::NOTICE, $message, $context);
 
@@ -161,7 +161,7 @@ public function notice(string|array $channel, string|array $message, array $cont
      * @return static
      * @throws Exception
      */
-    public function info(string|array $channel, string|array $message, array $context = []): static
+    public function info(string|array $channel, mixed $message, array $context = []): static
     {
         $this->log($channel, LogLevel::INFO, $message, $context);
 
@@ -178,7 +178,7 @@ public function info(string|array $channel, string|array $message, array $contex
      * @return static
      * @throws Exception
      */
-    public function debug(string|array $channel, string|array $message, array $context = []): static
+    public function debug(string|array $channel, mixed $message, array $context = []): static
     {
         $this->log($channel, LogLevel::DEBUG, $message, $context);
 
@@ -196,7 +196,7 @@ public function debug(string|array $channel, string|array $message, array $conte
      * @return static
      * @throws Exception
      */
-    public function log(string|array $channel, string|int $level, string|array $message, array $context = []): static
+    public function log(string|array $channel, string|int $level, mixed $message, array $context = []): static
     {
         if (is_array($channel)) {
             foreach ($channel as $cat) {
@@ -223,4 +223,9 @@ public function getLogger(string $channel): LoggerInterface
     {
         return $this->manager->get($channel);
     }
+
+    public static function parseTrace(string $trace): string
+    {
+        return '   ' . str_replace(WINDWALKER_ROOT, '{ROOT}', $trace);
+    }
 }