OilfieldToolsNet/shlink
4
0
Fork 0
mirror of https://github.com/shlinkio/shlink.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Removed transactionality when dispatching async events, as they run in different processes with different db connections

Browse Source
This commit is contained in:
Alejandro Celaya
2021-10-23 13:22:42 +02:00
parent 6f62d62909
commit c7a621cb31
7 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
module/CLI/src/Command/Db/CreateDatabaseCommand.php
View File

@@ -71,7 +71,7 @@ class CreateDatabaseCommand extends AbstractDatabaseCommand
$databases = $schemaManager->listDatabases();
$shlinkDatabase = $this->regularConn->getDatabase();
if (! contains($databases, $shlinkDatabase)) {
if ($shlinkDatabase !== null && ! contains($databases, $shlinkDatabase)) {
$schemaManager->createDatabase($shlinkDatabase);
}
}

8
module/Core/src/Visit/VisitsTracker.php
View File

@@ -69,11 +69,9 @@ class VisitsTracker implements VisitsTrackerInterface
}
$visit = $createVisit($visitor->normalizeForTrackingOptions($this->options));
$this->em->transactional(function () use ($visit, $visitor): void {
$this->em->persist($visit);
$this->em->flush();
$this->em->persist($visit);
$this->em->flush();
$this->eventDispatcher->dispatch(new UrlVisited($visit->getId(), $visitor->getRemoteAddress()));
});
$this->eventDispatcher->dispatch(new UrlVisited($visit->getId(), $visitor->getRemoteAddress()));
}
}

7
module/Core/test/Visit/VisitsTrackerTest.php
View File

@@ -29,10 +29,6 @@ class VisitsTrackerTest extends TestCase
public function setUp(): void
{
$this->em = $this->prophesize(EntityManager::class);
$this->em->transactional(Argument::any())->will(function (array $args) {
[$callback] = $args;
return $callback();
});
$this->eventDispatcher = $this->prophesize(EventDispatcherInterface::class);
$this->options = new TrackingOptions();
@@ -52,7 +48,6 @@ class VisitsTrackerTest extends TestCase
$this->visitsTracker->{$method}(...$args);
$persist->shouldHaveBeenCalledOnce();
$this->em->transactional(Argument::cetera())->shouldHaveBeenCalledOnce();
$this->em->flush()->shouldHaveBeenCalledOnce();
$this->eventDispatcher->dispatch(Argument::type(UrlVisited::class))->shouldHaveBeenCalled();
}
@@ -68,7 +63,6 @@ class VisitsTrackerTest extends TestCase
$this->visitsTracker->{$method}(...$args);
$this->eventDispatcher->dispatch(Argument::cetera())->shouldNotHaveBeenCalled();
$this->em->transactional(Argument::cetera())->shouldNotHaveBeenCalled();
$this->em->persist(Argument::cetera())->shouldNotHaveBeenCalled();
$this->em->flush()->shouldNotHaveBeenCalled();
}
@@ -92,7 +86,6 @@ class VisitsTrackerTest extends TestCase
$this->visitsTracker->{$method}(Visitor::emptyInstance());
$this->eventDispatcher->dispatch(Argument::cetera())->shouldNotHaveBeenCalled();
$this->em->transactional(Argument::cetera())->shouldNotHaveBeenCalled();
$this->em->persist(Argument::cetera())->shouldNotHaveBeenCalled();
$this->em->flush()->shouldNotHaveBeenCalled();
}

2
module/Rest/src/Action/HealthAction.php
View File

@@ -32,7 +32,7 @@ class HealthAction extends AbstractRestAction
public function handle(ServerRequestInterface $request): ResponseInterface
{
try {
$connected = $this->em->getConnection()->ping();
$connected = $this->em->getConnection()->isConnected();
} catch (Throwable) {
$connected = false;
}

6
module/Rest/test/Action/HealthActionTest.php
View File

@@ -34,7 +34,7 @@ class HealthActionTest extends TestCase
/** @test */
public function passResponseIsReturnedWhenConnectionSucceeds(): void
{
$ping = $this->conn->ping()->willReturn(true);
$ping = $this->conn->isConnected()->willReturn(true);
/** @var JsonResponse $resp */
$resp = $this->action->handle(new ServerRequest());
@@ -54,7 +54,7 @@ class HealthActionTest extends TestCase
/** @test */
public function failResponseIsReturnedWhenConnectionFails(): void
{
$ping = $this->conn->ping()->willReturn(false);
$ping = $this->conn->isConnected()->willReturn(false);
/** @var JsonResponse $resp */
$resp = $this->action->handle(new ServerRequest());
@@ -74,7 +74,7 @@ class HealthActionTest extends TestCase
/** @test */
public function failResponseIsReturnedWhenConnectionThrowsException(): void
{
$ping = $this->conn->ping()->willThrow(Exception::class);
$ping = $this->conn->isConnected()->willThrow(Exception::class);
/** @var JsonResponse $resp */
$resp = $this->action->handle(new ServerRequest());