This commit is contained in:
2020-11-17 17:06:31 +08:00
parent 4d6bbce700
commit 6d1401641f
+14 -10
View File
@@ -48,9 +48,10 @@ class ServerInotify extends Process
Event::add($this->inotify, [$this, 'check']); Event::add($this->inotify, [$this, 'check']);
Event::wait(); Event::wait();
} else { } else {
foreach ($this->dirs as $dir) { $this->loadByDir(APP_PATH . 'app');
$this->loadByDir($dir); $this->loadByDir(APP_PATH . 'routes');
} $this->loadByDir(__DIR__ . '/../../');
Timer::after(2000, [$this, 'tick']);
} }
} }
@@ -63,8 +64,11 @@ class ServerInotify extends Process
*/ */
public function tick() public function tick()
{ {
foreach ($this->dirs as $dir) { $this->loadByDir(APP_PATH . 'app', true);
$this->loadByDir($dir, true); $this->loadByDir(APP_PATH . 'routes', true);
$this->loadByDir(__DIR__ . '/../../', true);
if ($this->isReloading) {
return;
} }
Timer::after(2000, [$this, 'tick']); Timer::after(2000, [$this, 'tick']);
} }
@@ -94,7 +98,6 @@ class ServerInotify extends Process
break; break;
} }
} }
Timer::after(2000, [$this, 'tick']);
} }
@@ -186,7 +189,6 @@ class ServerInotify extends Process
*/ */
public function timerReload() public function timerReload()
{ {
Timer::clearAll();
if ($this->isReloading) { if ($this->isReloading) {
return; return;
} }
@@ -194,9 +196,11 @@ class ServerInotify extends Process
$this->trigger_reload(); $this->trigger_reload();
$this->int = -1; $this->int = -1;
$this->md5Map = []; $this->md5Map = [];
foreach ($this->dirs as $dir) {
$this->loadByDir($dir); $this->loadByDir(APP_PATH . 'app');
} $this->loadByDir(APP_PATH . 'routes');
$this->loadByDir(__DIR__ . '/../../');
$this->isReloading = FALSE; $this->isReloading = FALSE;
$this->isReloadingOut = FALSE; $this->isReloadingOut = FALSE;