hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-18 15:33:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #996 from romainneutron/better-notifier

Browse Source 
[3.9] More improviements in live notifier
This commit is contained in:
Nicolas Le Goff
2014-02-28 12:59:51 +01:00
parent 241c31a26b 4d4f7ec5da
commit 1497b6413a
12 changed files with 108 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/Alchemy/Phrasea/Command/Task/TaskList.php
View File

@@ -28,23 +28,24 @@ class TaskList extends Command
{
$output->writeln("<info>Querying the task manager...</info>");
$errors = 0;
$probe = $this->container['task-manager.live-information'];
$tasks = $this->container['manipulator.task']->getRepository()->findAll();
$infos = $this->container['task-manager.live-information']->getTasks($tasks);
$rows = [];
$rows = array_map(function (Task $task) use ($probe, &$errors) {
$info = $probe->getTask($task);
$error = $info['actual'] !== $task->getStatus();
if ($error) {
foreach ($tasks as $task) {
$info = isset($infos[$task->getId()]) ? $infos[$task->getId()] : ['actual' => null];
if (true === $error = $info['actual'] !== $task->getStatus()) {
$errors ++;
}
return [
$rows[] = [
$task->getId(),
$task->getName(),
$task->getStatus() !== 'started' ? "<comment>".$task->getStatus() . "</comment>" : $task->getStatus(),
$error ? "<error>".$info['actual']."</error>" : $info['actual'],
$info['process-id'],
];
}, $this->container['manipulator.task']->getRepository()->findAll());
}
$this
->getHelperSet()->get('table')

54
lib/Alchemy/Phrasea/TaskManager/LiveInformation.php
View File

@@ -32,14 +32,7 @@ class LiveInformation
*/
public function getManager($throwException = false)
{
try {
$data = $this->notifier->notify(Notifier::MESSAGE_INFORMATIONS, 2);
} catch (RuntimeException $e) {
if($throwException) {
throw $e;
}
$data = [];
}
$data = $this->query($throwException);
return [
'configuration' => $this->status->getStatus(),
@@ -55,14 +48,33 @@ class LiveInformation
*/
public function getTask(Task $task, $throwException = false)
{
try {
$data = $this->notifier->notify(Notifier::MESSAGE_INFORMATIONS, 2);
} catch (RuntimeException $e) {
if($throwException) {
throw $e;
}
$data = [];
$data = $this->query($throwException);
return $this->formatTask($task, $data);
}
/**
* Returns live informations about some tasks.
*
* @param Task[] $tasks
* @param boolean $throwException
*
* @return array
*/
public function getTasks($tasks, $throwException = false)
{
$data = $this->query($throwException);
$ret = [];
foreach ($tasks as $task) {
$ret[$task->getId()] = $this->formatTask($task, $data);
}
return $ret;
}
private function formatTask(Task $task, $data)
{
$taskData = (isset($data['jobs']) && isset($data['jobs'][$task->getId()])) ? $data['jobs'][$task->getId()] : [];
return [
@@ -71,4 +83,16 @@ class LiveInformation
'process-id' => isset($taskData['process-id']) ? $taskData['process-id'] : null,
];
}
private function query($throwException)
{
try {
return $this->notifier->notify(Notifier::MESSAGE_INFORMATIONS);
} catch (RuntimeException $e) {
if($throwException) {
throw $e;
}
return [];
}
}
}

24
lib/Alchemy/Phrasea/TaskManager/Notifier.php
View File

@@ -33,40 +33,46 @@ class Notifier
/** @var LoggerInterface */
private $logger;
/** @var integer */
private $timeout = 2;
public function __construct(\ZMQSocket $socket, LoggerInterface $logger)
{
$this->socket = $socket;
$this->logger = $logger;
}
public function setTimeout($timeout)
{
if ($timeout <= 0) {
throw new \InvalidArgumentException('Timeout must be a positive value');
}
$this->timeout = (float) $timeout;
}
/**
* Notifies the task manager given a message constant, see MESSAGE_* constants.
*
* @param string $message
* @param integer $timeout
*
* @return mixed|null The return value of the task manager.
*
* @throws RuntimeException in case notification did not occur within the timeout.
*/
public function notify($message, $timeout = 1)
public function notify($message)
{
if ($timeout <= 0) {
throw new \InvalidArgumentException('Timeout must be a positive value');
}
try {
$command = $this->createCommand($message);
$this->socket->send($command);
$limit = microtime(true) + $timeout;
$limit = microtime(true) + $this->timeout;
while (microtime(true) < $limit && false === $result = $this->socket->recv(\ZMQ::MODE_NOBLOCK)) {
usleep(1000);
}
if (false === $result) {
$this->logger->error(sprintf('Unable to notify the task manager with message "%s" within timeout of %d seconds', $message, $timeout));
$this->logger->error(sprintf('Unable to notify the task manager with message "%s" within timeout of %d seconds', $message, $this->timeout));
throw new RuntimeException('Unable to retrieve information.');
}
@@ -80,7 +86,7 @@ class Notifier
return $data['reply'];
} catch (\ZMQSocketException $e) {
$this->logger->error(sprintf('Unable to notify the task manager with message "%s" within timeout of %d seconds', $message, $timeout), array('exception' => $e));
$this->logger->error(sprintf('Unable to notify the task manager with message "%s" within timeout of %d seconds', $message, $this->timeout), array('exception' => $e));
throw new RuntimeException('Unable to retrieve information.', $e->getCode(), $e);
}
}

4
tests/Alchemy/Tests/Phrasea/Command/Task/SchedulerPauseTest.php
View File

@@ -17,6 +17,10 @@ class SchedulerPauseTest extends \PhraseanetTestCase
$input = $this->getMock('Symfony\Component\Console\Input\InputInterface');
$output = $this->getMock('Symfony\Component\Console\Output\OutputInterface');
self::$DI['cli']['monolog'] = self::$DI['cli']->share(function () {
return $this->createMonologMock();
});
$command = new SchedulerPauseTasks();
$command->setContainer(self::$DI['cli']);
$command->execute($input, $output);

4
tests/Alchemy/Tests/Phrasea/Command/Task/SchedulerResumeTest.php
View File

@@ -14,6 +14,10 @@ class SchedulerResumeTest extends \PhraseanetTestCase
self::$DI['cli']['task-manager.status']->expects($this->once())
->method('start');
self::$DI['cli']['monolog'] = self::$DI['cli']->share(function () {
return $this->createMonologMock();
});
$input = $this->getMock('Symfony\Component\Console\Input\InputInterface');
$output = $this->getMock('Symfony\Component\Console\Output\OutputInterface');

4
tests/Alchemy/Tests/Phrasea/Command/Task/SchedulerRunTest.php
View File

@@ -17,6 +17,10 @@ class SchedulerRunTest extends \PhraseanetTestCase
self::$DI['cli']['task-manager']->expects($this->once())
->method('start');
self::$DI['cli']['monolog'] = self::$DI['cli']->share(function () {
return $this->createMonologMock();
});
$input = $this->getMock('Symfony\Component\Console\Input\InputInterface');
$output = $this->getMock('Symfony\Component\Console\Output\OutputInterface');

4
tests/Alchemy/Tests/Phrasea/Command/Task/SchedulerStateTest.php
View File

@@ -11,6 +11,10 @@ class SchedulerStateTest extends \PhraseanetTestCase
$input = $this->getMock('Symfony\Component\Console\Input\InputInterface');
$output = $this->getMock('Symfony\Component\Console\Output\OutputInterface');
self::$DI['cli']['monolog'] = self::$DI['cli']->share(function () {
return $this->createMonologMock();
});
$command = new SchedulerState();
$command->setContainer(self::$DI['cli']);
$command->execute($input, $output);

4
tests/Alchemy/Tests/Phrasea/Command/Task/TaskListTest.php
View File

@@ -14,6 +14,10 @@ class TaskListTest extends \PhraseanetTestCase
->method('getFormatter')
->will($this->returnValue($this->getMock('Symfony\Component\Console\Formatter\OutputFormatterInterface')));
self::$DI['cli']['monolog'] = self::$DI['cli']->share(function () {
return $this->createMonologMock();
});
$command = new TaskList();
$command->setContainer(self::$DI['cli']);

4
tests/Alchemy/Tests/Phrasea/Command/Task/TaskStartTest.php
View File

@@ -17,6 +17,10 @@ class TaskStartTest extends \PhraseanetTestCase
->with('task_id')
->will($this->returnValue(1));
self::$DI['cli']['monolog'] = self::$DI['cli']->share(function () {
return $this->createMonologMock();
});
$command = new TaskStart();
$command->setContainer(self::$DI['cli']);
$command->execute($input, $output);

4
tests/Alchemy/Tests/Phrasea/Command/Task/TaskStateTest.php
View File

@@ -12,6 +12,10 @@ class TaskStateTest extends \PhraseanetTestCase
$input = $this->getMock('Symfony\Component\Console\Input\InputInterface');
$output = $this->getMock('Symfony\Component\Console\Output\OutputInterface');
self::$DI['cli']['monolog'] = self::$DI['cli']->share(function () {
return $this->createMonologMock();
});
$input->expects($this->any())
->method('getArgument')
->with('task_id')

4
tests/Alchemy/Tests/Phrasea/Command/Task/TaskStopTest.php
View File

@@ -17,6 +17,10 @@ class TaskStopTest extends \PhraseanetTestCase
->with('task_id')
->will($this->returnValue(1));
self::$DI['cli']['monolog'] = self::$DI['cli']->share(function () {
return $this->createMonologMock();
});
$command = new TaskStop();
$command->setContainer(self::$DI['cli']);
$command->execute($input, $output);

14
tests/classes/PhraseanetTestCase.php
View File

@@ -14,6 +14,7 @@ use Symfony\Component\DomCrawler\Crawler;
use Symfony\Component\Routing\RequestContext;
use Alchemy\Tests\Tools\TranslatorMockTrait;
use Alchemy\Phrasea\Authentication\ACLProvider;
use Alchemy\Phrasea\TaskManager\Notifier;
use Guzzle\Http\Client as Guzzle;
abstract class PhraseanetTestCase extends WebTestCase
@@ -294,6 +295,12 @@ abstract class PhraseanetTestCase extends WebTestCase
return $generator;
}));
$app['task-manager.notifier'] = $app->share($app->extend('task-manager.notifier', function (Notifier $notifier) {
$notifier->setTimeout(0.0001);
return $notifier;
}));
$app['translator'] = $this->createTranslatorMock();
$app['phraseanet.SE.subscriber'] = $this->getMock('Symfony\Component\EventDispatcher\EventSubscriberInterface');
@@ -642,4 +649,11 @@ abstract class PhraseanetTestCase extends WebTestCase
{
return $this->getMock('Psr\Log\LoggerInterface');
}
protected function createMonologMock()
{
return $this->getMockBuilder('Monolog\Logger')
->disableOriginalConstructor()
->getMock();
}
}