改名

kiri-engine/Error/LoggerAspect.php

@@ -5,8 +5,9 @@ namespace Kiri\Error;
 
 
 use Exception;
+use Http\Aspect\OnAspectInterface;
+use Http\Aspect\OnJoinPointInterface;
 use Http\Constrict\RequestInterface;
-use Kiri\IAspect;
 use Kiri\Kiri;
 
 
@@ -14,20 +15,24 @@ use Kiri\Kiri;
  * Class LoggerAspect
  * @package Kiri\Error
  */
-class LoggerAspect implements IAspect
+class LoggerAspect implements OnAspectInterface
 {
 
-	private float $time;
-
 
 	/**
-	 * @param mixed $handler
-	 * @param array $params
+	 * @param OnJoinPointInterface $joinPoint
 	 * @return mixed
+	 * @throws Exception
 	 */
-	public function invoke(mixed $handler, array $params = []): mixed
+	public function process(OnJoinPointInterface $joinPoint): mixed
 	{
-		return call_user_func($handler, ...$params);
+		$time = microtime(true);
+
+		$response = $joinPoint->process();
+
+		$this->print_runtime($time);
+
+		return $response;
 	}
 
 
@@ -44,20 +49,4 @@ class LoggerAspect implements IAspect
 		echo PHP_EOL;
 	}
 
-
-	public function before(): void
-	{
-		// TODO: Implement before() method.
-		$this->time = microtime(true);
-	}
-
-
-	/**
-	 * @throws Exception
-	 */
-	public function after(mixed $response): void
-	{
-		// TODO: Implement after() method.
-		$this->print_runtime($this->time);
-	}
 }

kiri-engine/FileListen/HotReload.php

@@ -138,17 +138,16 @@ class HotReload extends Command
 	public function trigger_reload()
 	{
 		$this->logger->warning('change reload');
-//		$pid = file_get_contents(storage('.swoole.pid'));
-//		if (!empty($pid) && Process::kill($pid, 0)) {
-//			Process::kill($pid, SIGTERM);
-//		}
-		if ($this->process && Process::kill($this->process->pid, 0)) {
-			Process::kill($this->process->pid) && Process::wait(true);
-		}
-		$this->process = new Process(function (Process $process) {
+		$pid  = $this->process?->pid;
+		$process = new Process(function (Process $process) {
 			$process->exec(PHP_BINARY, [APP_PATH . "kiri.php", "sw:server", "restart"]);
 		});
-		$this->process->start();
+		$process->start();
+		if ($pid && Process::kill($pid, 0)) {
+			Process::kill($pid) && Process::wait(true);
+		}
+		$this->process = null;
+		$this->process = $process;
 	}
 
 

kiri-engine/FileListen/Inotify.php

@@ -47,28 +47,23 @@ class Inotify
 	public function clear()
 	{
 		Event::del($this->inotify);
-
-        var_dump('clear event');
-
 		Event::exit();
 	}
 
 
-    /**
-     * 开始监听
-     * @throws Exception
-     */
+	/**
+	 * 开始监听
+	 * @throws Exception
+	 */
 	public function check()
 	{
 		if (!($events = inotify_read($this->inotify))) {
 			return;
 		}
 		if ($this->process->isReloading) {
-			if (!$this->process->isReloadingOut) {
-				$this->process->isReloadingOut = true;
-			}
 			return;
 		}
+
 		$LISTEN_TYPE = [IN_CREATE, IN_DELETE, IN_MODIFY, IN_MOVED_TO, IN_MOVED_FROM];
 		foreach ($events as $ev) {
 			if (!in_array($ev['mask'], $LISTEN_TYPE)) {
@@ -76,10 +71,6 @@ class Inotify
 			}
 			//非重启类型
 			if (str_ends_with($ev['name'], '.php')) {
-				if ($this->process->int !== -1) {
-					return;
-				}
-                usleep(200);
 				$this->reload();
 			}
 		}
@@ -90,7 +81,12 @@ class Inotify
 	 */
 	public function reload()
 	{
+		if ($this->process->isReloading) {
+			return;
+		}
+
 		$this->process->isReloading = true;
+
 		$this->process->trigger_reload();
 		$this->clearWatch();
 		foreach ($this->dirs as $root) {
@@ -98,7 +94,6 @@ class Inotify
 		}
 		$this->process->int = -1;
 		$this->process->isReloading = FALSE;
-		$this->process->isReloadingOut = FALSE;
 	}
 
 

kiri-engine/FileListen/Scaner.php

@@ -103,6 +103,9 @@ class Scaner
 	 */
 	public function timerReload()
 	{
+		if ($this->process->isReloading) {
+			return;
+		}
 		$this->process->isReloading = true;
 		$this->process->trigger_reload();