diff --git a/HttpServer/Events/OnWorkerStart.php b/HttpServer/Events/OnWorkerStart.php index a661ca0f..94b47fd0 100644 --- a/HttpServer/Events/OnWorkerStart.php +++ b/HttpServer/Events/OnWorkerStart.php @@ -36,8 +36,9 @@ class OnWorkerStart extends Callback putenv('state=start'); putenv('worker=' . $worker_id); - if (env('debug') === 'true') { - annotation()->read(APP_PATH . 'app', 'App'); + if (env('debug', 'false') == 'true') { + $attribute = Snowflake::app()->getAttributes(); + $attribute->read(directory('app'), 'App'); } if ($worker_id >= $server->setting['worker_num']) { diff --git a/HttpServer/Server.php b/HttpServer/Server.php index 15bf8303..21d9ea46 100644 --- a/HttpServer/Server.php +++ b/HttpServer/Server.php @@ -464,7 +464,7 @@ class Server extends HttpService $event = Snowflake::app()->getEvent(); $event->on(Event::SERVER_WORKER_START, function () { $annotation = Snowflake::app()->getAttributes(); - if (env('debug') !== 'true') { + if (env('debug') != 'true') { return; } $router = Snowflake::app()->getRouter(); @@ -484,7 +484,7 @@ class Server extends HttpService $event = Snowflake::app()->getEvent(); $event->on(Event::SERVER_WORKER_START, function () { $annotation = Snowflake::app()->getAttributes(); - if (env('debug') !== 'true') { + if (env('debug') != 'true') { return; } $annotation->instanceDirectoryFiles(SOCKET_PATH); diff --git a/System/Application.php b/System/Application.php index c48de4aa..1aa1649e 100644 --- a/System/Application.php +++ b/System/Application.php @@ -109,9 +109,9 @@ class Application extends BaseApplication { try { fire(Event::SERVER_BEFORE_START); - if (env('debug') === 'false') { + if (env('debug') == 'false') { $annotation = Snowflake::app()->getAttributes(); - $annotation->read(APP_PATH . 'app', 'App'); + $annotation->read(directory('app'), 'App'); } $manager = Snowflake::app()->get('console'); $manager->setParameters($argv); diff --git a/System/Process/ServerInotify.php b/System/Process/ServerInotify.php index 9e47fe6e..7515c107 100644 --- a/System/Process/ServerInotify.php +++ b/System/Process/ServerInotify.php @@ -40,7 +40,7 @@ class ServerInotify extends Process public function onHandler(\Swoole\Process $process): void { set_error_handler([$this, 'onErrorHandler']); - if (env('debug') !== 'true') { + if (env('debug') != 'true') { Timer::tick(100000, function () { }); diff --git a/function.php b/function.php index e42ac292..e6d87d96 100644 --- a/function.php +++ b/function.php @@ -9,6 +9,7 @@ use HttpServer\Http\HttpParams; use HttpServer\Http\Request; use HttpServer\Http\Response; use HttpServer\Route\Router; +use JetBrains\PhpStorm\Pure; use Snowflake\Error\Logger; use Snowflake\Exception\ComponentException; use Snowflake\Exception\NotFindClassException; @@ -119,6 +120,21 @@ if (!function_exists('recursive_directory')) { } +if (!function_exists('directory')) { + + /** + * @param $name + * @return string + */ + #[Pure] function directory($name): string + { + return realpath(APP_PATH . $name); + } + + +} + + if (!function_exists('isUrl')) {