@@ -1,19 +1,12 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | namespace Alpixel\Bundle\CronBundle\Command; |
| 3 | 3 | use Doctrine\ORM\EntityManager; |
| 4 | - |
|
| 5 | 4 | use Symfony\Component\Console\Input\ArgvInput; |
| 6 | - |
|
| 7 | 5 | use Alpixel\Bundle\CronBundle\Entity\CronJobResult; |
| 8 | - |
|
| 9 | 6 | use Alpixel\Bundle\CronBundle\Entity\CronJob; |
| 10 | - |
|
| 11 | 7 | use Symfony\Component\Console\Output\OutputInterface; |
| 12 | - |
|
| 13 | 8 | use Symfony\Component\Console\Input\InputInterface; |
| 14 | - |
|
| 15 | 9 | use Symfony\Component\Console\Input\InputArgument; |
| 16 | - |
|
| 17 | 10 | use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand; |
| 18 | 11 | |
| 19 | 12 | class CronRunCommand extends ContainerAwareCommand |
@@ -41,14 +41,12 @@ discard block |
||
| 41 | 41 | { |
| 42 | 42 | $jobsToRun = array($jobObj); |
| 43 | 43 | } |
| 44 | - } |
|
| 45 | - catch(\Exception $e) |
|
| 44 | + } catch(\Exception $e) |
|
| 46 | 45 | { |
| 47 | 46 | $output->writeln("Couldn't find a job by the name of $jobName"); |
| 48 | 47 | return CronJobResult::FAILED; |
| 49 | 48 | } |
| 50 | - } |
|
| 51 | - else |
|
| 49 | + } else |
|
| 52 | 50 | { |
| 53 | 51 | $jobsToRun = $jobRepo->findDueTasks(); |
| 54 | 52 | } |
@@ -76,8 +74,7 @@ discard block |
||
| 76 | 74 | try |
| 77 | 75 | { |
| 78 | 76 | $commandToRun = $this->getApplication()->get($job->getCommand()); |
| 79 | - } |
|
| 80 | - catch(InvalidArgumentException $ex) |
|
| 77 | + } catch(InvalidArgumentException $ex) |
|
| 81 | 78 | { |
| 82 | 79 | $output->writeln(" skipped (command no longer exists)"); |
| 83 | 80 | $this->recordJobResult($em, $job, 0, "Command no longer exists", CronJobResult::SKIPPED); |
@@ -93,8 +90,7 @@ discard block |
||
| 93 | 90 | try |
| 94 | 91 | { |
| 95 | 92 | $returnCode = $commandToRun->execute($emptyInput, $jobOutput); |
| 96 | - } |
|
| 97 | - catch(\Exception $ex) |
|
| 93 | + } catch(\Exception $ex) |
|
| 98 | 94 | { |
| 99 | 95 | $returnCode = CronJobResult::FAILED; |
| 100 | 96 | $jobOutput->writeln(""); |
@@ -114,12 +110,10 @@ discard block |
||
| 114 | 110 | if($returnCode == CronJobResult::SKIPPED) |
| 115 | 111 | { |
| 116 | 112 | $statusStr = "skipped"; |
| 117 | - } |
|
| 118 | - elseif($returnCode == CronJobResult::SUCCEEDED) |
|
| 113 | + } elseif($returnCode == CronJobResult::SUCCEEDED) |
|
| 119 | 114 | { |
| 120 | 115 | $statusStr = "succeeded"; |
| 121 | - } |
|
| 122 | - elseif($returnCode == CronJobResult::FAILED) |
|
| 116 | + } elseif($returnCode == CronJobResult::FAILED) |
|
| 123 | 117 | { |
| 124 | 118 | $statusStr = "failed"; |
| 125 | 119 | } |
@@ -1,21 +1,12 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | namespace Alpixel\Bundle\CronBundle\Command; |
| 3 | 3 | use Alpixel\Bundle\CronBundle\Entity\CronJob; |
| 4 | - |
|
| 5 | 4 | use Doctrine\ORM\EntityManager; |
| 6 | - |
|
| 7 | 5 | use Symfony\Component\Console\Command\Command; |
| 8 | - |
|
| 9 | 6 | use Alpixel\Bundle\CronBundle\Annotation\CronJob as CronJobAnno; |
| 10 | - |
|
| 11 | -use Symfony\Bundle\DoctrineBundle\Registry; |
|
| 12 | - |
|
| 13 | 7 | use Symfony\Component\Console\Output\OutputInterface; |
| 14 | - |
|
| 15 | 8 | use Symfony\Component\Console\Input\InputInterface; |
| 16 | - |
|
| 17 | 9 | use Symfony\Component\Console\Input\InputOption; |
| 18 | - |
|
| 19 | 10 | use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand; |
| 20 | 11 | |
| 21 | 12 | class CronScanCommand extends ContainerAwareCommand |
@@ -68,8 +68,7 @@ |
||
| 68 | 68 | $currentJob->setNextRun($newTime); |
| 69 | 69 | $output->writeln("Updated interval for $job to {$anno->value}"); |
| 70 | 70 | } |
| 71 | - } |
|
| 72 | - else |
|
| 71 | + } else |
|
| 73 | 72 | { |
| 74 | 73 | $this->newJobFound($em, $output, $command, $anno, $defaultDisabled); |
| 75 | 74 | } |
@@ -1,15 +1,10 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | namespace Alpixel\Bundle\CronBundle\Command; |
| 3 | 3 | use Alpixel\Bundle\CronBundle\Entity\CronJobResult; |
| 4 | - |
|
| 5 | 4 | use Alpixel\Bundle\CronBundle\Entity\CronJob; |
| 6 | - |
|
| 7 | 5 | use Symfony\Component\Console\Output\OutputInterface; |
| 8 | - |
|
| 9 | 6 | use Symfony\Component\Console\Input\InputInterface; |
| 10 | - |
|
| 11 | 7 | use Symfony\Component\Console\Input\InputArgument; |
| 12 | - |
|
| 13 | 8 | use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand; |
| 14 | 9 | |
| 15 | 10 | class CronStatusCommand extends ContainerAwareCommand |
@@ -32,14 +32,12 @@ discard block |
||
| 32 | 32 | try |
| 33 | 33 | { |
| 34 | 34 | $cronJobs = array($jobRepo->findOneByCommand($jobName)); |
| 35 | - } |
|
| 36 | - catch(\Exception $e) |
|
| 35 | + } catch(\Exception $e) |
|
| 37 | 36 | { |
| 38 | 37 | $output->writeln("Couldn't find a job by the name of $jobName"); |
| 39 | 38 | return CronJobResult::FAILED; |
| 40 | 39 | } |
| 41 | - } |
|
| 42 | - else |
|
| 40 | + } else |
|
| 43 | 41 | { |
| 44 | 42 | $cronJobs = $em->getRepository('CronBundle:CronJob')->findAll(); |
| 45 | 43 | } |
@@ -56,16 +54,14 @@ discard block |
||
| 56 | 54 | if(!$cronJob->getEnabled()) |
| 57 | 55 | { |
| 58 | 56 | $output->writeln(" Not scheduled"); |
| 59 | - } |
|
| 60 | - else |
|
| 57 | + } else |
|
| 61 | 58 | { |
| 62 | 59 | $output->write(" Scheduled for: "); |
| 63 | 60 | $now = new \DateTime(); |
| 64 | 61 | if($cronJob->getNextRun() <= $now) |
| 65 | 62 | { |
| 66 | 63 | $output->writeln("Next run"); |
| 67 | - } |
|
| 68 | - else |
|
| 64 | + } else |
|
| 69 | 65 | { |
| 70 | 66 | $output->writeln(strftime("%c", $cronJob->getNextRun()->getTimestamp())); |
| 71 | 67 | } |
@@ -86,8 +82,7 @@ discard block |
||
| 86 | 82 | break; |
| 87 | 83 | } |
| 88 | 84 | $output->writeln(" Last run was: $status"); |
| 89 | - } |
|
| 90 | - else |
|
| 85 | + } else |
|
| 91 | 86 | { |
| 92 | 87 | $output->writeln(" This job has not yet been run"); |
| 93 | 88 | } |
@@ -28,8 +28,7 @@ discard block |
||
| 28 | 28 | if($job) |
| 29 | 29 | { |
| 30 | 30 | $output->writeln("Pruning logs for cron job $job"); |
| 31 | - } |
|
| 32 | - else |
|
| 31 | + } else |
|
| 33 | 32 | { |
| 34 | 33 | $output->writeln("Pruning logs for all cron jobs"); |
| 35 | 34 | } |
@@ -44,8 +43,7 @@ discard block |
||
| 44 | 43 | } |
| 45 | 44 | |
| 46 | 45 | $em->getRepository('CronBundle:CronJobResult')->deleteOldLogs($jobObj); |
| 47 | - } |
|
| 48 | - else |
|
| 46 | + } else |
|
| 49 | 47 | { |
| 50 | 48 | $em->getRepository('CronBundle:CronJobResult')->deleteOldLogs(); |
| 51 | 49 | } |