mirrors/shlink
1
0
Fork 0
mirror of https://github.com/shlinkio/shlink.git synced 2024-11-24 05:38:06 +03:00
Code Issues Projects Releases Packages Wiki Activity

Updated GeolocationDbUpdater so that it handles a lock which prevents the db to be updated in parallel

Browse source
This commit is contained in:
Alejandro Celaya 2019-07-20 11:30:26 +02:00
parent e0e522c3f5
commit f28540a53e
2 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
module/CLI/config/dependencies.config.php
View file

@ -48,7 +48,7 @@ return [
], ],
ConfigAbstractFactory::class => [ ConfigAbstractFactory::class => [
GeolocationDbUpdater::class => [DbUpdater::class, Reader::class], GeolocationDbUpdater::class => [DbUpdater::class, Reader::class, Lock\Factory::class],
Command\ShortUrl\GenerateShortUrlCommand::class => [Service\UrlShortener::class, 'config.url_shortener.domain'], Command\ShortUrl\GenerateShortUrlCommand::class => [Service\UrlShortener::class, 'config.url_shortener.domain'],
Command\ShortUrl\ResolveUrlCommand::class => [Service\UrlShortener::class], Command\ShortUrl\ResolveUrlCommand::class => [Service\UrlShortener::class],

15
module/CLI/src/Util/GeolocationDbUpdater.php
View file

@ -9,18 +9,24 @@ use InvalidArgumentException;
use Shlinkio\Shlink\CLI\Exception\GeolocationDbUpdateFailedException; use Shlinkio\Shlink\CLI\Exception\GeolocationDbUpdateFailedException;
use Shlinkio\Shlink\Common\Exception\RuntimeException; use Shlinkio\Shlink\Common\Exception\RuntimeException;
use Shlinkio\Shlink\Common\IpGeolocation\GeoLite2\DbUpdaterInterface; use Shlinkio\Shlink\Common\IpGeolocation\GeoLite2\DbUpdaterInterface;
use Symfony\Component\Lock\Factory as Locker;
class GeolocationDbUpdater implements GeolocationDbUpdaterInterface class GeolocationDbUpdater implements GeolocationDbUpdaterInterface
{ {
private const LOCK_NAME = 'geolocation-db-update';
/** @var DbUpdaterInterface */ /** @var DbUpdaterInterface */
private $dbUpdater; private $dbUpdater;
/** @var Reader */ /** @var Reader */
private $geoLiteDbReader; private $geoLiteDbReader;
/** @var Locker */
private $locker;
public function __construct(DbUpdaterInterface $dbUpdater, Reader $geoLiteDbReader) public function __construct(DbUpdaterInterface $dbUpdater, Reader $geoLiteDbReader, Locker $locker)
{ {
$this->dbUpdater = $dbUpdater; $this->dbUpdater = $dbUpdater;
$this->geoLiteDbReader = $geoLiteDbReader; $this->geoLiteDbReader = $geoLiteDbReader;
$this->locker = $locker;
} }
/** /**
@ -28,6 +34,11 @@ class GeolocationDbUpdater implements GeolocationDbUpdaterInterface
*/ */
public function checkDbUpdate(callable $mustBeUpdated = null, callable $handleProgress = null): void public function checkDbUpdate(callable $mustBeUpdated = null, callable $handleProgress = null): void
{ {
$lock = $this->locker->createLock(self::LOCK_NAME);
if (! $lock->acquire()) {
return;
}
try { try {
$meta = $this->geoLiteDbReader->metadata(); $meta = $this->geoLiteDbReader->metadata();
if ($this->buildIsTooOld($meta->__get('buildEpoch'))) { if ($this->buildIsTooOld($meta->__get('buildEpoch'))) {
@ -36,6 +47,8 @@ class GeolocationDbUpdater implements GeolocationDbUpdaterInterface
} catch (InvalidArgumentException $e) { } catch (InvalidArgumentException $e) {
// This is the exception thrown by the reader when the database file does not exist // This is the exception thrown by the reader when the database file does not exist
$this->downloadNewDb(false, $mustBeUpdated, $handleProgress); $this->downloadNewDb(false, $mustBeUpdated, $handleProgress);
} finally {
$lock->release();
} }
} }