改名

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/Inotify.php

@@ -47,9 +47,6 @@ class Inotify
 	public function clear()
 	{
 		Event::del($this->inotify);
-
-        var_dump('clear event');
-
 		Event::exit();
 	}
 
@@ -76,10 +73,7 @@ class Inotify
 			}
 			//非重启类型
 			if (str_ends_with($ev['name'], '.php')) {
-				if ($this->process->int !== -1) {
-					return;
-				}
-                usleep(200);
+                sleep(2);
 				$this->reload();
 			}
 		}