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

Remove support of binary paths by registry

Browse Source
This commit is contained in:
Romain Neutron
2013-06-26 16:58:36 +02:00
parent 21eea19074
commit 32875e6698
9 changed files with 56 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/classes/task/Scheduler.php
View File

@@ -11,6 +11,7 @@
use Alchemy\Phrasea\Application;
use Monolog\Logger;
use Symfony\Component\Process\ExecutableFinder;
/**
*
@@ -62,7 +63,14 @@ class task_Scheduler
public function run()
{
//prevent scheduler to fail if GV_cli is not provided
if ( ! is_executable($this->dependencyContainer['phraseanet.registry']->get('php_binary'))) {
if (isset($this->dependencyContainer['phraseanet.configuration']['binaries']['php_binary'])) {
$php = $this->dependencyContainer['phraseanet.configuration']['binaries']['php_binary'];
} else {
$finder = new ExecutableFinder();
$php = $finder->find($php);
}
if ( ! is_executable($php)) {
throw new \RuntimeException('PHP cli is not provided in registry');
}
@@ -225,7 +233,7 @@ class task_Scheduler
$taskPoll[$tkey] = array(
"task" => $task,
"current_status" => $status,
"cmd" => $this->dependencyContainer['phraseanet.registry']->get('php_binary'),
"cmd" => $php,
"args" => array(
'-f',
$this->dependencyContainer['root.path'] . '/bin/console',