From 2aa2c614798cc74aa85d77fdd9ad7a5166303917 Mon Sep 17 00:00:00 2001 From: Michael Date: Sun, 25 Jul 2021 04:31:48 +0000 Subject: [PATCH] Lock before recreate / fix cache key misspelling --- src/App/Router.php | 18 ++++++++++++++++-- tests/src/App/RouterTest.php | 26 ++++++++++++++++---------- 2 files changed, 32 insertions(+), 12 deletions(-) diff --git a/src/App/Router.php b/src/App/Router.php index 82c493baa..ad4b33d08 100644 --- a/src/App/Router.php +++ b/src/App/Router.php @@ -30,6 +30,7 @@ use Friendica\Core\Cache\Duration; use Friendica\Core\Cache\ICache; use Friendica\Core\Hook; use Friendica\Core\L10n; +use Friendica\Core\Lock\ILock; use Friendica\Network\HTTPException; /** @@ -79,6 +80,9 @@ class Router /** @var ICache */ private $cache; + /** @var ILock */ + private $lock; + /** @var string */ private $baseRoutesFilepath; @@ -89,11 +93,12 @@ class Router * @param ICache $cache * @param RouteCollector|null $routeCollector */ - public function __construct(array $server, string $baseRoutesFilepath, L10n $l10n, ICache $cache, RouteCollector $routeCollector = null) + public function __construct(array $server, string $baseRoutesFilepath, L10n $l10n, ICache $cache, ILock $lock, RouteCollector $routeCollector = null) { $this->baseRoutesFilepath = $baseRoutesFilepath; $this->l10n = $l10n; $this->cache = $cache; + $this->lock = $lock; $httpMethod = $server['REQUEST_METHOD'] ?? self::GET; $this->httpMethod = in_array($httpMethod, self::ALLOWED_METHODS) ? $httpMethod : self::GET; @@ -301,11 +306,20 @@ class Router return $routerDispatchData; } + if (!$this->lock->acquire('getCachedDispatchData', 0)) { + // Immediately return uncached data when we can't aquire a lock + return $this->getDispatchData(); + } + $routerDispatchData = $this->getDispatchData(); $this->cache->set('routerDispatchData', $routerDispatchData, Duration::DAY); if (!empty($routesFileModifiedTime)) { - $this->cache->set('lastRoutesFileMtime', $routesFileModifiedTime, Duration::MONTH); + $this->cache->set('lastRoutesFileModifiedTime', $routesFileModifiedTime, Duration::MONTH); + } + + if ($this->lock->isLocked('getCachedDispatchData')) { + $this->lock->release('getCachedDispatchData'); } return $routerDispatchData; diff --git a/tests/src/App/RouterTest.php b/tests/src/App/RouterTest.php index a5824c455..a3e8b026b 100644 --- a/tests/src/App/RouterTest.php +++ b/tests/src/App/RouterTest.php @@ -24,6 +24,7 @@ namespace Friendica\Test\src\App; use Friendica\App\Router; use Friendica\Core\Cache\ICache; use Friendica\Core\L10n; +use Friendica\Core\Lock\ILock; use Friendica\Module; use Friendica\Network\HTTPException\MethodNotAllowedException; use Friendica\Network\HTTPException\NotFoundException; @@ -39,6 +40,10 @@ class RouterTest extends TestCase * @var ICache */ private $cache; + /** + * @var ILock + */ + private $lock; protected function setUp() : void { @@ -54,7 +59,7 @@ class RouterTest extends TestCase public function testGetModuleClass() { - $router = new Router(['REQUEST_METHOD' => Router::GET], '', $this->l10n, $this->cache); + $router = new Router(['REQUEST_METHOD' => Router::GET], '', $this->l10n, $this->cache, $this->lock); $routeCollector = $router->getRouteCollector(); $routeCollector->addRoute([Router::GET], '/', 'IndexModuleClassName'); @@ -78,7 +83,7 @@ class RouterTest extends TestCase public function testPostModuleClass() { - $router = new Router(['REQUEST_METHOD' => Router::POST], '', $this->l10n, $this->cache); + $router = new Router(['REQUEST_METHOD' => Router::POST], '', $this->l10n, $this->cache, $this->lock); $routeCollector = $router->getRouteCollector(); $routeCollector->addRoute([Router::POST], '/', 'IndexModuleClassName'); @@ -104,7 +109,7 @@ class RouterTest extends TestCase { $this->expectException(NotFoundException::class); - $router = new Router(['REQUEST_METHOD' => Router::GET], '', $this->l10n, $this->cache); + $router = new Router(['REQUEST_METHOD' => Router::GET], '', $this->l10n, $this->cache, $this->lock); $router->getModuleClass('/unsupported'); } @@ -113,7 +118,7 @@ class RouterTest extends TestCase { $this->expectException(NotFoundException::class); - $router = new Router(['REQUEST_METHOD' => Router::GET], '', $this->l10n, $this->cache); + $router = new Router(['REQUEST_METHOD' => Router::GET], '', $this->l10n, $this->cache, $this->lock); $routeCollector = $router->getRouteCollector(); $routeCollector->addRoute([Router::GET], '/test', 'TestModuleClassName'); @@ -125,7 +130,7 @@ class RouterTest extends TestCase { $this->expectException(NotFoundException::class); - $router = new Router(['REQUEST_METHOD' => Router::GET], '', $this->l10n, $this->cache); + $router = new Router(['REQUEST_METHOD' => Router::GET], '', $this->l10n, $this->cache, $this->lock); $routeCollector = $router->getRouteCollector(); $routeCollector->addRoute([Router::GET], '/optional[/option]', 'OptionalModuleClassName'); @@ -137,7 +142,7 @@ class RouterTest extends TestCase { $this->expectException(NotFoundException::class); - $router = new Router(['REQUEST_METHOD' => Router::GET], '', $this->l10n, $this->cache); + $router = new Router(['REQUEST_METHOD' => Router::GET], '', $this->l10n, $this->cache, $this->lock); $routeCollector = $router->getRouteCollector(); $routeCollector->addRoute([Router::GET], '/variable/{var}', 'VariableModuleClassName'); @@ -149,7 +154,7 @@ class RouterTest extends TestCase { $this->expectException(MethodNotAllowedException::class); - $router = new Router(['REQUEST_METHOD' => Router::POST], '', $this->l10n, $this->cache); + $router = new Router(['REQUEST_METHOD' => Router::POST], '', $this->l10n, $this->cache, $this->lock); $routeCollector = $router->getRouteCollector(); $routeCollector->addRoute([Router::GET], '/test', 'TestModuleClassName'); @@ -161,7 +166,7 @@ class RouterTest extends TestCase { $this->expectException(MethodNotAllowedException::class); - $router = new Router(['REQUEST_METHOD' => Router::GET], '', $this->l10n, $this->cache); + $router = new Router(['REQUEST_METHOD' => Router::GET], '', $this->l10n, $this->cache, $this->lock); $routeCollector = $router->getRouteCollector(); $routeCollector->addRoute([Router::POST], '/test', 'TestModuleClassName'); @@ -203,7 +208,8 @@ class RouterTest extends TestCase ['REQUEST_METHOD' => Router::GET], '', $this->l10n, - $this->cache + $this->cache, + $this->lock ))->loadRoutes($routes); self::assertEquals(Module\Home::class, $router->getModuleClass('/')); @@ -219,7 +225,7 @@ class RouterTest extends TestCase { $router = (new Router([ 'REQUEST_METHOD' => Router::POST - ], '', $this->l10n, $this->cache))->loadRoutes($routes); + ], '', $this->l10n, $this->cache, $this->lock))->loadRoutes($routes); // Don't find GET self::assertEquals(Module\WellKnown\NodeInfo::class, $router->getModuleClass('/post/it'));