Merge remote-tracking branch 'origin/master'

# Conflicts:
#	kiri-engine/FileListen/HotReload.php

kiri-engine/Application.php

@@ -223,6 +223,7 @@ class Application extends BaseApplication
 	}
 
 
+
 	/**
 	 * @throws NotFindClassException
 	 * @throws ReflectionException
@@ -240,6 +241,8 @@ class Application extends BaseApplication
 	}
 
 
+
+
 	/**
 	 * @param $className
 	 * @param null $abstracts

kiri-engine/FileListen/Inotify.php

@@ -47,12 +47,16 @@ class Inotify
 	public function clear()
 	{
 		Event::del($this->inotify);
+
+        var_dump('clear event');
+
 		Event::exit();
 	}
 
 
     /**
      * 开始监听
+     * @throws Exception
      */
 	public function check()
 	{
@@ -75,7 +79,10 @@ class Inotify
 				if ($this->process->int !== -1) {
 					return;
 				}
-				$this->process->int = @swoole_timer_after(2000, [$this, 'reload']);
+
+                usleep(200);
+
+				$this->reload();
 
 				$this->process->isReloading = true;
 			}
@@ -151,7 +158,6 @@ class Inotify
 			} else if (!str_ends_with($f, '.php')) {
 				continue;
 			}
-
 			//检测文件类型
 			if (strstr($f, '.') == '.php') {
 				$wd = @inotify_add_watch($this->inotify, $path, $this->events);