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

fix bad conflict correction

Browse Source
This commit is contained in:
jygaulier
2012-05-02 18:59:25 +02:00
parent 6d822237da
commit 864a62782d
1 changed files with 32 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/classes/module/console/taskrun.class.php
View File

@@ -65,23 +65,14 @@ class module_console_taskrun extends Command
} }
} }
public function execute(InputInterface $input, OutputInterface $output)
{
if ( ! setup::is_installed()) {
if ($this->task) {
$this->task->log(sprintf("signal %s received", $signo));
if ($signo == SIGTERM)
$this->task->set_running(false);
}
}
// printf("%s (%d) execute\n", __FILE__, __LINE__);
}
public function execute(InputInterface $input, OutputInterface $output) public function execute(InputInterface $input, OutputInterface $output)
{ {
if ( ! setup::is_installed()) { if ( ! setup::is_installed()) {
$output->writeln('Phraseanet is not set up'); $output->writeln('Phraseanet is not set up');
return 1;
}
$task_id = (int) $input->getArgument('task_id');
if ($task_id <= 0 || strlen($task_id) !== strlen($input->getArgument('task_id'))) if ($task_id <= 0 || strlen($task_id) !== strlen($input->getArgument('task_id')))
throw new \RuntimeException('Argument must be an Id.'); throw new \RuntimeException('Argument must be an Id.');
@@ -121,7 +112,6 @@ class module_console_taskrun extends Command
$runner = task_abstract::RUNNER_MANUAL; $runner = task_abstract::RUNNER_MANUAL;
} }
} }
}
public function tick_handler() public function tick_handler()
{ {