diff --git a/lib/Service.php b/lib/Service.php index 4a7f1cd..7eb3177 100644 --- a/lib/Service.php +++ b/lib/Service.php @@ -48,6 +48,7 @@ class Service { pcntl_signal_dispatch(); if ($this->reload) { $this->reload(); + fwrite(\STDERR, Arsse::$lang->msg("Service.Reload").\PHP_EOL); } } } while ($this->loop && $t->getTimestamp() > time()); @@ -62,7 +63,6 @@ class Service { Arsse::$user = Arsse::$db = Arsse::$conf = Arsse::$lang = Arsse::$obj = $this->drv = null; Arsse::bootstrap(); $this->__construct(); - fwrite(\STDERR, Arsse::$lang->msg("Service.Reload").\PHP_EOL); } public function checkIn(): bool { diff --git a/tests/cases/Service/TestService.php b/tests/cases/Service/TestService.php index 6c90358..277df8f 100644 --- a/tests/cases/Service/TestService.php +++ b/tests/cases/Service/TestService.php @@ -88,4 +88,18 @@ class TestService extends \JKingWeb\Arsse\Test\AbstractTest { $this->dbMock->articleCleanup->called(); $this->dbMock->metaSet->calledWith("service_last_checkin", $this->anything(), "datetime"); } + + public function testReloadTheService(): void { + $u = Arsse::$user; + $l = Arsse::$lang; + $d = Arsse::$db; + $o = Arsse::$obj; + $c = Arsse::$conf; + $this->srv->reload(); + $this->assertNotSame($u, Arsse::$user); + $this->assertNotSame($l, Arsse::$lang); + $this->assertNotSame($d, Arsse::$db); + $this->assertNotSame($o, Arsse::$obj); + $this->assertNotSame($c, Arsse::$conf); + } }