diff --git a/Kiri.php b/Kiri.php index 3c38b7b3..94f83689 100644 --- a/Kiri.php +++ b/Kiri.php @@ -89,7 +89,7 @@ class Kiri if (Kiri::getPlatform()->isMac()) { return; } - $name = '[' . \config('id', 'system-service') . ']'; + $name = '[' . \config('site.id', 'system-service') . ']'; if (!empty($prefix)) { $name .= '.' . $prefix; } @@ -104,7 +104,7 @@ class Kiri public static function getStoragePath(): string { $default = APP_PATH . 'storage' . DIRECTORY_SEPARATOR; - $path = \config('storage', $default); + $path = \config('site.log.path', $default); if (!is_dir($path)) { mkdir($path, 0777, true); } diff --git a/function.php b/function.php index 01e03cb9..80a4b211 100644 --- a/function.php +++ b/function.php @@ -769,7 +769,7 @@ if (!function_exists('process_name_set')) { return; } - $name = \config('id', 'system') . '[' . $pid . ']'; + $name = \config('site.id', 'system') . '[' . $pid . ']'; if (!empty($prefix)) { $name .= '.' . $prefix; } diff --git a/kiri-engine/Application.php b/kiri-engine/Application.php index 465de937..f2840572 100644 --- a/kiri-engine/Application.php +++ b/kiri-engine/Application.php @@ -54,10 +54,10 @@ class Application extends BaseApplication */ public function init(): void { - $this->errorHandler->registerShutdownHandler(config('error.shutdown', [])); - $this->errorHandler->registerExceptionHandler(config('error.exception', [])); - $this->errorHandler->registerErrorHandler(config('error.error', [])); - $this->id = config('id', uniqid('id.')); + $this->errorHandler->registerShutdownHandler(config('site.error.shutdown', [])); + $this->errorHandler->registerExceptionHandler(config('site.error.exception', [])); + $this->errorHandler->registerErrorHandler(config('site.error.error', [])); + $this->id = config('site.id', uniqid('id.')); $this->provider->on(OnBeforeCommandExecute::class, [$this, 'beforeCommandExecute']); } @@ -73,7 +73,7 @@ class Application extends BaseApplication if (!($beforeCommandExecute->command instanceof ServerCommand)) { $scanner = $this->container->get(Scanner::class); $scanner->load_directory(APP_PATH . 'app/'); - } else if (config('reload.hot', false) === false) { + } else if (config('site.reload.hot', false) === false) { $scanner = $this->container->get(Scanner::class); $scanner->load_directory(APP_PATH . 'app/'); } diff --git a/kiri-engine/Error/StdoutLogger.php b/kiri-engine/Error/StdoutLogger.php index bf6aeb7a..0ff51a62 100644 --- a/kiri-engine/Error/StdoutLogger.php +++ b/kiri-engine/Error/StdoutLogger.php @@ -48,7 +48,7 @@ class StdoutLogger extends Component { parent::__construct(); - $this->logger = new Logger(\config('id')); + $this->logger = new Logger(\config('site.id')); $this->levels = [ 'debug' => $this->logger::DEBUG, 'info' => $this->logger::INFO,