-
Notifications
You must be signed in to change notification settings - Fork 379
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Resolve image caches in background. Using message queue. #919
Merged
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,71 @@ | ||
<?php | ||
namespace Liip\ImagineBundle\Async; | ||
|
||
use Enqueue\Util\JSON; | ||
|
||
class CacheResolved implements \JsonSerializable | ||
{ | ||
/** | ||
* @var string | ||
*/ | ||
private $path; | ||
|
||
/** | ||
* @var \string[] | ||
*/ | ||
private $uris; | ||
|
||
/** | ||
* @param string $path | ||
* @param string[]|null $uris | ||
*/ | ||
public function __construct($path, array $uris) | ||
{ | ||
$this->path = $path; | ||
$this->uris = $uris; | ||
} | ||
|
||
/** | ||
* @return string | ||
*/ | ||
public function getPath() | ||
{ | ||
return $this->path; | ||
} | ||
|
||
/** | ||
* @return \string[] | ||
*/ | ||
public function getUris() | ||
{ | ||
return $this->uris; | ||
} | ||
|
||
/** | ||
* {@inheritdoc} | ||
*/ | ||
public function jsonSerialize() | ||
{ | ||
return array('path' => $this->path, 'uris' => $this->uris); | ||
} | ||
|
||
/** | ||
* @param string $json | ||
* | ||
* @return static | ||
*/ | ||
public static function jsonDeserialize($json) | ||
{ | ||
$data = JSON::decode($json); | ||
|
||
if (empty($data['path'])) { | ||
throw new \LogicException('The message does not contain "path" but it is required.'); | ||
} | ||
|
||
if (empty($data['uris'])) { | ||
throw new \LogicException('The message uris must not be empty array.'); | ||
} | ||
|
||
return new static($data['path'], $data['uris']); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,86 @@ | ||
<?php | ||
namespace Liip\ImagineBundle\Async; | ||
|
||
use Enqueue\Util\JSON; | ||
|
||
class ResolveCache implements \JsonSerializable | ||
{ | ||
/** | ||
* @var string | ||
*/ | ||
private $path; | ||
|
||
/** | ||
* @var array|null|\string[] | ||
*/ | ||
private $filters; | ||
|
||
/** | ||
* @var bool | ||
*/ | ||
private $force; | ||
|
||
/** | ||
* @param string $path | ||
* @param string[]|null $filters | ||
* @param bool $force | ||
*/ | ||
public function __construct($path, array $filters = null, $force = false) | ||
{ | ||
$this->path = $path; | ||
$this->filters = $filters; | ||
$this->force = $force; | ||
} | ||
|
||
/** | ||
* @return string | ||
*/ | ||
public function getPath() | ||
{ | ||
return $this->path; | ||
} | ||
|
||
/** | ||
* @return null|\string[] | ||
*/ | ||
public function getFilters() | ||
{ | ||
return $this->filters; | ||
} | ||
|
||
/** | ||
* @return bool | ||
*/ | ||
public function isForce() | ||
{ | ||
return $this->force; | ||
} | ||
|
||
/** | ||
* {@inheritdoc} | ||
*/ | ||
public function jsonSerialize() | ||
{ | ||
return array('path' => $this->path, 'filters' => $this->filters, 'force' => $this->force); | ||
} | ||
|
||
/** | ||
* @param string $json | ||
* | ||
* @return static | ||
*/ | ||
public static function jsonDeserialize($json) | ||
{ | ||
$data = array_replace(array('path' => null, 'filters' => null, 'force' => false), JSON::decode($json)); | ||
|
||
if (false == $data['path']) { | ||
throw new \LogicException('The message does not contain "path" but it is required.'); | ||
} | ||
|
||
if (false == (is_null($data['filters']) || is_array($data['filters']))) { | ||
throw new \LogicException('The message filters could be either null or array.'); | ||
} | ||
|
||
return new static($data['path'], $data['filters'], $data['force']); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,108 @@ | ||
<?php | ||
namespace Liip\ImagineBundle\Async; | ||
|
||
use Enqueue\Client\ProducerInterface; | ||
use Enqueue\Client\TopicSubscriberInterface; | ||
use Enqueue\Consumption\QueueSubscriberInterface; | ||
use Enqueue\Consumption\Result; | ||
use Enqueue\Psr\PsrContext; | ||
use Enqueue\Psr\PsrMessage; | ||
use Enqueue\Psr\PsrProcessor; | ||
use Liip\ImagineBundle\Imagine\Cache\CacheManager; | ||
use Liip\ImagineBundle\Imagine\Data\DataManager; | ||
use Liip\ImagineBundle\Imagine\Filter\FilterManager; | ||
|
||
class ResolveCacheProcessor implements PsrProcessor, TopicSubscriberInterface, QueueSubscriberInterface | ||
{ | ||
/** | ||
* @var CacheManager | ||
*/ | ||
private $cacheManager; | ||
|
||
/** | ||
* @var FilterManager | ||
*/ | ||
private $filterManager; | ||
|
||
/** | ||
* @var DataManager | ||
*/ | ||
private $dataManager; | ||
|
||
/** | ||
* @var ProducerInterface | ||
*/ | ||
private $producer; | ||
|
||
/** | ||
* @param CacheManager $cacheManager | ||
* @param FilterManager $filterManager | ||
* @param DataManager $dataManager | ||
* @param ProducerInterface $producer | ||
*/ | ||
public function __construct( | ||
CacheManager $cacheManager, | ||
FilterManager $filterManager, | ||
DataManager $dataManager, | ||
ProducerInterface $producer | ||
) { | ||
$this->cacheManager = $cacheManager; | ||
$this->filterManager = $filterManager; | ||
$this->dataManager = $dataManager; | ||
$this->producer = $producer; | ||
} | ||
|
||
/** | ||
* {@inheritdoc} | ||
*/ | ||
public function process(PsrMessage $psrMessage, PsrContext $psrContext) | ||
{ | ||
try { | ||
$message = ResolveCache::jsonDeserialize($psrMessage->getBody()); | ||
} catch (\Exception $e) { | ||
return Result::reject($e->getMessage()); | ||
} | ||
|
||
$filters = $message->getFilters() ?: array_keys($this->filterManager->getFilterConfiguration()->all()); | ||
$path = $message->getPath(); | ||
$results = array(); | ||
foreach ($filters as $filter) { | ||
if ($this->cacheManager->isStored($path, $filter) && $message->isForce()) { | ||
$this->cacheManager->remove($path, $filter); | ||
} | ||
|
||
if (false == $this->cacheManager->isStored($path, $filter)) { | ||
$binary = $this->dataManager->find($filter, $path); | ||
$this->cacheManager->store( | ||
$this->filterManager->applyFilter($binary, $filter), | ||
$path, | ||
$filter | ||
); | ||
} | ||
|
||
$results[$filter] = $this->cacheManager->resolve($path, $filter); | ||
} | ||
|
||
$this->producer->send(Topics::CACHE_RESOLVED, new CacheResolved($path, $results)); | ||
|
||
return self::ACK; | ||
} | ||
|
||
/** | ||
* {@inheritdoc} | ||
*/ | ||
public static function getSubscribedTopics() | ||
{ | ||
return array( | ||
Topics::RESOLVE_CACHE => array('queueName' => Topics::RESOLVE_CACHE, 'queueNameHardcoded' => true), | ||
); | ||
} | ||
|
||
/** | ||
* {@inheritdoc} | ||
*/ | ||
public static function getSubscribedQueues() | ||
{ | ||
return array(Topics::RESOLVE_CACHE); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
<?php | ||
namespace Liip\ImagineBundle\Async; | ||
|
||
class Topics | ||
{ | ||
const RESOLVE_CACHE = 'liip_imagine_resolve_cache'; | ||
|
||
const CACHE_RESOLVED = 'liip_imagine_cache_resolved'; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
<?xml version="1.0" encoding="utf-8" ?> | ||
<container xmlns="http://symfony.com/schema/dic/services" | ||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"> | ||
|
||
<services> | ||
<service id="liip_imagine.async.resolve_cache_processor" class="Liip\ImagineBundle\Async\ResolveCacheProcessor"> | ||
<argument type="service" id="liip_imagine.cache.manager" /> | ||
<argument type="service" id="liip_imagine.filter.manager" /> | ||
<argument type="service" id="liip_imagine.data.manager" /> | ||
<argument type="service" id="enqueue.producer" /> | ||
|
||
<tag name="enqueue.client.processor" /> | ||
</service> | ||
</services> | ||
</container> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why not enable this test globally for all supported PHP versions? Or at least all PHP 7.x runs? I think this would be a better approach to ensure no incompatibilities are introduced across Symfony versions. We already have some Symfony 2.32,
2.8
,3.2
and3.3
specific features or toggled usages.All PHP
5.6
and PHP7.x
RunsAll PHP
7.x
RunsThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The dependency is optional therefore I dont want it to be tested all the time.
What if something goes wrong when enqueue is not installed and we do not notice it?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
not only PHP version has to be taken into account but the version of Symfony as well. EnqueueBundle requires 2.8|3.0.