diff --git a/kiri-engine/Abstracts/Logger.php b/kiri-engine/Abstracts/Logger.php index a607a2cb..e1bd1743 100644 --- a/kiri-engine/Abstracts/Logger.php +++ b/kiri-engine/Abstracts/Logger.php @@ -28,156 +28,156 @@ use Symfony\Component\Console\Output\OutputInterface; class Logger implements LoggerInterface { - const EMERGENCY = 'emergency'; - const ALERT = 'alert'; - const CRITICAL = 'critical'; - const ERROR = 'error'; - const WARNING = 'warning'; - const NOTICE = 'notice'; - const INFO = 'info'; - const DEBUG = 'debug'; + const EMERGENCY = 'emergency'; + const ALERT = 'alert'; + const CRITICAL = 'critical'; + const ERROR = 'error'; + const WARNING = 'warning'; + const NOTICE = 'notice'; + const INFO = 'info'; + const DEBUG = 'debug'; - const LOGGER_LEVELS = [Logger::EMERGENCY, Logger::ALERT, Logger::CRITICAL, Logger::ERROR, Logger::WARNING, Logger::NOTICE, Logger::INFO, Logger::DEBUG]; + const LOGGER_LEVELS = [Logger::EMERGENCY, Logger::ALERT, Logger::CRITICAL, Logger::ERROR, Logger::WARNING, Logger::NOTICE, Logger::INFO, Logger::DEBUG]; - private array $levels = []; + private array $levels = []; /** * */ - public function __construct() - { - $this->levels = \config('log.level', Logger::LOGGER_LEVELS); - } + public function __construct() + { + $this->levels = \config('log.level', Logger::LOGGER_LEVELS); + } - /** - * @param string $message - * @param array $context - * - * 紧急情况 - */ - public function emergency($message, array $context = []) - { - // TODO: Implement emergency() method. - $this->log(Logger::EMERGENCY, $message, $context); - } + /** + * @param string $message + * @param array $context + * + * 紧急情况 + */ + public function emergency($message, array $context = []) + { + // TODO: Implement emergency() method. + $this->log(Logger::EMERGENCY, $message, $context); + } - /** - * @param string $message - * @param array $context - * - * 应该警惕的 - */ - public function alert($message, array $context = []) - { - // TODO: Implement alert() method. - $this->log(Logger::ALERT, $message, $context); - } + /** + * @param string $message + * @param array $context + * + * 应该警惕的 + */ + public function alert($message, array $context = []) + { + // TODO: Implement alert() method. + $this->log(Logger::ALERT, $message, $context); + } - /** - * @param string $name - * @param array $arguments - * @return void - * @throws ReflectionException - */ - public static function __callStatic(string $name, array $arguments) - { - // TODO: Implement __callStatic() method. - $name = str_replace('_', '', $name); - Kiri::getLogger()->{$name}(...$arguments); - } + /** + * @param string $name + * @param array $arguments + * @return void + * @throws ReflectionException + */ + public static function __callStatic(string $name, array $arguments) + { + // TODO: Implement __callStatic() method. + $name = str_replace('_', '', $name); + Kiri::getLogger()->{$name}(...$arguments); + } - /** - * @param string $message - * @param array $context - * - * 关键性的日志 - */ - public function critical($message, array $context = []) - { - // TODO: Implement critical() method. - $this->log(Logger::CRITICAL, $message, $context); - } + /** + * @param string $message + * @param array $context + * + * 关键性的日志 + */ + public function critical($message, array $context = []) + { + // TODO: Implement critical() method. + $this->log(Logger::CRITICAL, $message, $context); + } - /** - * @param string $message - * @param array $context - */ - public function error($message, array $context = []) - { - // TODO: Implement error() method. - $this->log(Logger::ERROR, $message, $context); - } + /** + * @param string $message + * @param array $context + */ + public function error($message, array $context = []) + { + // TODO: Implement error() method. + $this->log(Logger::ERROR, $message, $context); + } - /** - * @param string $message - * @param array $context - */ - public function warning($message, array $context = []) - { - // TODO: Implement warning() method. - $this->log(Logger::WARNING, $message, $context); - } + /** + * @param string $message + * @param array $context + */ + public function warning($message, array $context = []) + { + // TODO: Implement warning() method. + $this->log(Logger::WARNING, $message, $context); + } - /** - * @param string $message - * @param array $context - */ - public function notice($message, array $context = []) - { - // TODO: Implement notice() method. - $this->log(Logger::NOTICE, $message, $context); - } + /** + * @param string $message + * @param array $context + */ + public function notice($message, array $context = []) + { + // TODO: Implement notice() method. + $this->log(Logger::NOTICE, $message, $context); + } - /** - * @param string $message - * @param array $context - */ - public function info($message, array $context = []) - { - // TODO: Implement info() method. - $this->log(Logger::INFO, $message, $context); - } + /** + * @param string $message + * @param array $context + */ + public function info($message, array $context = []) + { + // TODO: Implement info() method. + $this->log(Logger::INFO, $message, $context); + } - /** - * @param string $message - * @param array $context - */ - public function debug($message, array $context = []) - { - // TODO: Implement debug() method. - $this->log(Logger::DEBUG, $message, $context); - } + /** + * @param string $message + * @param array $context + */ + public function debug($message, array $context = []) + { + // TODO: Implement debug() method. + $this->log(Logger::DEBUG, $message, $context); + } - /** - * @param mixed $level - * @param string $message - * @param array $context - * @throws - */ - public function log($level, $message, array $context = []): void - { - if (!in_array($level, $this->levels)) { - return; - } - $_string = "[" . now() . ']' . ucfirst($level) . ": " . $message; - if (!empty($context)) { - $_string .= PHP_EOL . $this->_string($context); - } - if (str_contains($_string, 'Event::rshutdown')) { - return; - } + /** + * @param mixed $level + * @param string $message + * @param array $context + * @throws + */ + public function log($level, $message, array $context = []): void + { + if (!in_array($level, $this->levels)) { + return; + } + $_string = "[" . now() . ']: ' . $message; + if (!empty($context)) { + $_string .= PHP_EOL . $this->_string($context); + } + if (str_contains($_string, 'Event::rshutdown')) { + return; + } $container = Kiri::getDi(); if ($container->has(OutputInterface::class)) { @@ -187,58 +187,58 @@ class Logger implements LoggerInterface file_put_contents('php://output', $message . PHP_EOL); } - $filename = storage('log-' . date('Y-m-d') . '.log', 'log/'); + $filename = storage('/log-' . date('Y-m-d') . '.log', 'log/' . $level . '/'); - file_put_contents($filename, $_string, FILE_APPEND); - } + file_put_contents($filename, $_string, FILE_APPEND); + } - /** - * @return void - * @throws Exception - */ - public function flush(): void - { - $this->removeFile(storage()); - } + /** + * @return void + * @throws Exception + */ + public function flush(): void + { + $this->removeFile(storage()); + } - /** - * @param string $dirname - * @return void - */ - private function removeFile(string $dirname): void - { - $paths = new DirectoryIterator($dirname); - /** @var DirectoryIterator $path */ - foreach ($paths as $path) { - if ($path->isDot() || str_starts_with($path->getFilename(), '.')) { - continue; - } - if ($path->isDir()) { - $directory = rtrim($path->getRealPath(), '/'); - $this->removeFile($directory); - } - @unlink($path->getRealPath()); - } - } + /** + * @param string $dirname + * @return void + */ + private function removeFile(string $dirname): void + { + $paths = new DirectoryIterator($dirname); + /** @var DirectoryIterator $path */ + foreach ($paths as $path) { + if ($path->isDot() || str_starts_with($path->getFilename(), '.')) { + continue; + } + if ($path->isDir()) { + $directory = rtrim($path->getRealPath(), '/'); + $this->removeFile($directory); + } + @unlink($path->getRealPath()); + } + } - /** - * @param $context - * @return string - */ - private function _string($context): string - { - if ($context instanceof \Throwable) { - $context = 'file -> ' . $context->getFile() . PHP_EOL . 'line -> ' . $context->getLine() . PHP_EOL; - } - if (is_array($context) && isset($context[0]) && $context[0] instanceof \Throwable) { - $context = 'file -> ' . $context[0]->getFile() . PHP_EOL . 'line -> ' . $context[0]->getLine() . PHP_EOL; - } - if (is_string($context)) { - return $context . PHP_EOL; - } - return implode(PHP_EOL, $context); - } + /** + * @param $context + * @return string + */ + private function _string($context): string + { + if ($context instanceof \Throwable) { + $context = 'file -> ' . $context->getFile() . PHP_EOL . 'line -> ' . $context->getLine() . PHP_EOL; + } + if (is_array($context) && isset($context[0]) && $context[0] instanceof \Throwable) { + $context = 'file -> ' . $context[0]->getFile() . PHP_EOL . 'line -> ' . $context[0]->getLine() . PHP_EOL; + } + if (is_string($context)) { + return $context . PHP_EOL; + } + return implode(PHP_EOL, $context); + } } diff --git a/kiri-engine/Pool/Pool.php b/kiri-engine/Pool/Pool.php index fb076969..5b28082a 100644 --- a/kiri-engine/Pool/Pool.php +++ b/kiri-engine/Pool/Pool.php @@ -4,7 +4,6 @@ namespace Kiri\Pool; -use Database\Mysql\PDO; use Exception; use Kiri\Abstracts\Component; use Kiri\Exception\ConfigException;