| @@ -11,6 +11,9 @@ | ||
| 11 | 11 | protected $dm; | 
| 12 | 12 | protected $documentName; | 
| 13 | 13 | |
| 14 | + /** | |
| 15 | + * @param string $documentName | |
| 16 | + */ | |
| 14 | 17 | public function __construct(DocumentManager $dm, $documentName) | 
| 15 | 18 |      { | 
| 16 | 19 | $this->dm = $dm; | 
| @@ -16,7 +16,7 @@ discard block | ||
| 16 | 16 | } | 
| 17 | 17 | |
| 18 | 18 | /** | 
| 19 | - * @param field_type $jobClass | |
| 19 | + * @param string $jobClass | |
| 20 | 20 | */ | 
| 21 | 21 | public function setJobClass($jobClass) | 
| 22 | 22 |      { | 
| @@ -29,7 +29,7 @@ discard block | ||
| 29 | 29 | } | 
| 30 | 30 | |
| 31 | 31 | /** | 
| 32 | - * @return the $jobManager | |
| 32 | + * @return JobManagerInterface $jobManager | |
| 33 | 33 | */ | 
| 34 | 34 | public function getJobManager() | 
| 35 | 35 |      { | 
| @@ -53,6 +53,9 @@ discard block | ||
| 53 | 53 | return new $this->jobClass($this, $batch, $priority, $dateTime); | 
| 54 | 54 | } | 
| 55 | 55 | |
| 56 | + /** | |
| 57 | + * @param integer $priority | |
| 58 | + */ | |
| 56 | 59 | public function later($delay = 0, $priority = null) | 
| 57 | 60 |      { | 
| 58 | 61 | $job = $this->at(time() + $delay, false, $priority); | 
| @@ -60,6 +63,9 @@ discard block | ||
| 60 | 63 | return $job; | 
| 61 | 64 | } | 
| 62 | 65 | |
| 66 | + /** | |
| 67 | + * @param integer $priority | |
| 68 | + */ | |
| 63 | 69 | public function batchLater($delay = 0, $priority = null) | 
| 64 | 70 |      { | 
| 65 | 71 | $job = $this->at($delay, true, $priority); | 
| @@ -67,6 +73,10 @@ discard block | ||
| 67 | 73 | return $job; | 
| 68 | 74 | } | 
| 69 | 75 | |
| 76 | + /** | |
| 77 | + * @param integer $time | |
| 78 | + * @param integer $priority | |
| 79 | + */ | |
| 70 | 80 | public function batchAt($time = null, $priority = null) | 
| 71 | 81 |      { | 
| 72 | 82 | return $this->at($time, true, $priority); | 
| @@ -33,6 +33,9 @@ | ||
| 33 | 33 | return $job; | 
| 34 | 34 | } | 
| 35 | 35 | |
| 36 | + /** | |
| 37 | + * @param string $workerName | |
| 38 | + */ | |
| 36 | 39 | public function getJob($workerName = null, $methodName = null, $prioritize = true) | 
| 37 | 40 |      { | 
| 38 | 41 |          if ($methodName) { | 
| @@ -104,6 +104,11 @@ | ||
| 104 | 104 | } | 
| 105 | 105 | } | 
| 106 | 106 | |
| 107 | + /** | |
| 108 | + * @param integer|null $time | |
| 109 | + * @param string $method | |
| 110 | + * @param integer $priority | |
| 111 | + */ | |
| 107 | 112 |      protected function assertJob(Job $job, $time, $method, $priority = null) { | 
| 108 | 113 | $this->assertNotEmpty($job->getId(), "Job should have an id"); | 
| 109 | 114 | |
| @@ -14,7 +14,7 @@ | ||
| 14 | 14 |  { | 
| 15 | 15 | public function load(array $configs, ContainerBuilder $container) | 
| 16 | 16 |      { | 
| 17 | - $documentName = 'Dtc\QueueBundle\Documents\Job'; | |
| 17 | + $documentName = 'Dtc\QueueBundle\Documents\Job'; | |
| 18 | 18 | $processor = new Processor(); | 
| 19 | 19 | $configuration = new Configuration(); | 
| 20 | 20 | |
| @@ -7,7 +7,7 @@ | ||
| 7 | 7 | use Symfony\Component\DependencyInjection\ContainerBuilder; | 
| 8 | 8 | |
| 9 | 9 | class DtcQueueBundle | 
| 10 | - extends Bundle | |
| 10 | + extends Bundle | |
| 11 | 11 |  { | 
| 12 | 12 | public function build(ContainerBuilder $container) | 
| 13 | 13 |      { | 
| @@ -383,19 +383,19 @@ | ||
| 383 | 383 |      { | 
| 384 | 384 | $this->worker = $worker; | 
| 385 | 385 | } | 
| 386 | - /** | |
| 387 | - * @return the $elapsed | |
| 388 | - */ | |
| 389 | - public function getElapsed() | |
| 390 | -	{ | |
| 391 | - return $this->elapsed; | |
| 392 | - } | |
| 393 | - | |
| 394 | - /** | |
| 395 | - * @param field_type $elapsed | |
| 396 | - */ | |
| 397 | - public function setElapsed($elapsed) | |
| 398 | -	{ | |
| 399 | - $this->elapsed = $elapsed; | |
| 400 | - } | |
| 386 | + /** | |
| 387 | + * @return the $elapsed | |
| 388 | + */ | |
| 389 | + public function getElapsed() | |
| 390 | +    { | |
| 391 | + return $this->elapsed; | |
| 392 | + } | |
| 393 | + | |
| 394 | + /** | |
| 395 | + * @param field_type $elapsed | |
| 396 | + */ | |
| 397 | + public function setElapsed($elapsed) | |
| 398 | +    { | |
| 399 | + $this->elapsed = $elapsed; | |
| 400 | + } | |
| 401 | 401 | } | 
| @@ -7,94 +7,94 @@ | ||
| 7 | 7 | |
| 8 | 8 | class WorkerManager | 
| 9 | 9 |  { | 
| 10 | - protected $workers; | |
| 11 | - protected $jobManager; | |
| 12 | - protected $logger; | |
| 10 | + protected $workers; | |
| 11 | + protected $jobManager; | |
| 12 | + protected $logger; | |
| 13 | 13 | protected $eventDispatcher; | 
| 14 | 14 | |
| 15 | -	public function __construct(JobManagerInterface $jobManager, EventDispatcher $eventDispatcher, Logger $logger = null) { | |
| 16 | - $this->workers = array(); | |
| 17 | - $this->jobManager = $jobManager; | |
| 18 | - $this->logger = $logger; | |
| 15 | +    public function __construct(JobManagerInterface $jobManager, EventDispatcher $eventDispatcher, Logger $logger = null) { | |
| 16 | + $this->workers = array(); | |
| 17 | + $this->jobManager = $jobManager; | |
| 18 | + $this->logger = $logger; | |
| 19 | 19 | $this->eventDispatcher = $eventDispatcher; | 
| 20 | - } | |
| 20 | + } | |
| 21 | 21 | |
| 22 | -	public function addWorker(Worker $worker) { | |
| 23 | -		if ($this->logger) { | |
| 24 | -			$this->logger->debug("Added worker: {$worker->getName()}"); | |
| 25 | - } | |
| 22 | +    public function addWorker(Worker $worker) { | |
| 23 | +        if ($this->logger) { | |
| 24 | +            $this->logger->debug("Added worker: {$worker->getName()}"); | |
| 25 | + } | |
| 26 | 26 | |
| 27 | -		if (isset($this->workers[$worker->getName()])) { | |
| 28 | -			throw new \Exception("{$worker->getName()} already exists in worker manager"); | |
| 29 | - } | |
| 27 | +        if (isset($this->workers[$worker->getName()])) { | |
| 28 | +            throw new \Exception("{$worker->getName()} already exists in worker manager"); | |
| 29 | + } | |
| 30 | 30 | |
| 31 | - $this->workers[$worker->getName()] = $worker; | |
| 32 | - } | |
| 31 | + $this->workers[$worker->getName()] = $worker; | |
| 32 | + } | |
| 33 | 33 | |
| 34 | -	public function getWorker($name) { | |
| 35 | -		if (isset($this->workers[$name])) { | |
| 36 | - return $this->workers[$name]; | |
| 37 | - } | |
| 34 | +    public function getWorker($name) { | |
| 35 | +        if (isset($this->workers[$name])) { | |
| 36 | + return $this->workers[$name]; | |
| 37 | + } | |
| 38 | 38 | |
| 39 | - return null; | |
| 40 | - } | |
| 39 | + return null; | |
| 40 | + } | |
| 41 | 41 | |
| 42 | -	public function getWorkers() { | |
| 43 | - return $this->workers; | |
| 44 | - } | |
| 42 | +    public function getWorkers() { | |
| 43 | + return $this->workers; | |
| 44 | + } | |
| 45 | 45 | |
| 46 | - public function run($workerName = null, $methodName = null, $prioritize = true) | |
| 47 | -	{ | |
| 48 | - $job = $this->jobManager->getJob($workerName, $methodName, $prioritize); | |
| 49 | -		if (!$job) { | |
| 50 | -			if ($this->logger) { | |
| 51 | -				$this->logger->debug("No job to run"); | |
| 52 | - } | |
| 46 | + public function run($workerName = null, $methodName = null, $prioritize = true) | |
| 47 | +    { | |
| 48 | + $job = $this->jobManager->getJob($workerName, $methodName, $prioritize); | |
| 49 | +        if (!$job) { | |
| 50 | +            if ($this->logger) { | |
| 51 | +                $this->logger->debug("No job to run"); | |
| 52 | + } | |
| 53 | 53 | |
| 54 | - return; // no job to run | |
| 55 | - } | |
| 54 | + return; // no job to run | |
| 55 | + } | |
| 56 | 56 | |
| 57 | - return $this->runJob($job); | |
| 58 | - } | |
| 57 | + return $this->runJob($job); | |
| 58 | + } | |
| 59 | 59 | |
| 60 | -	public function runJob(Job $job) { | |
| 60 | +    public function runJob(Job $job) { | |
| 61 | 61 | $event = new Event($job); | 
| 62 | 62 | $this->eventDispatcher->dispatch(Event::PRE_JOB, $event); | 
| 63 | 63 | |
| 64 | -		try { | |
| 65 | - $start = microtime(true); | |
| 66 | - $worker = $this->getWorker($job->getWorkerName()); | |
| 67 | -			if ($this->logger) { | |
| 68 | -				$this->logger->debug("Start: {$job->getClassName()}->{$job->getMethod()}", $job->getArgs()); | |
| 69 | - } | |
| 70 | - | |
| 71 | - call_user_func_array(array($worker, $job->getMethod()), $job->getArgs()); | |
| 72 | - | |
| 73 | - // Job finshed successfuly... do we remove the job from database? | |
| 74 | - $job->setStatus(Job::STATUS_SUCCESS); | |
| 75 | - $job->setMessage(null); | |
| 76 | - } | |
| 77 | -		catch (\Exception $e) { | |
| 78 | -			if ($this->logger) { | |
| 79 | -				$this->logger->debug("Failed: {$job->getClassName()}->{$job->getMethod()}\n{$e->getMessage()}"); | |
| 80 | - } | |
| 81 | - | |
| 82 | - $job->setStatus(Job::STATUS_ERROR); | |
| 83 | - $job->setMessage($e->getMessage() . "\n" .$e->getTraceAsString()); | |
| 84 | - } | |
| 85 | - | |
| 86 | - // save Job history | |
| 87 | - $elapsed = microtime(true) - $start; | |
| 88 | - $job->setElapsed($elapsed); | |
| 89 | - | |
| 90 | -		if ($this->logger) { | |
| 91 | -			$this->logger->debug("Finished: {$job->getClassName()}->{$job->getMethod()} in {$elapsed} micro-seconds"); | |
| 92 | -			$this->logger->debug("Save job history: {$job->getId()}"); | |
| 93 | - } | |
| 94 | - | |
| 95 | - $this->jobManager->saveHistory($job); | |
| 64 | +        try { | |
| 65 | + $start = microtime(true); | |
| 66 | + $worker = $this->getWorker($job->getWorkerName()); | |
| 67 | +            if ($this->logger) { | |
| 68 | +                $this->logger->debug("Start: {$job->getClassName()}->{$job->getMethod()}", $job->getArgs()); | |
| 69 | + } | |
| 70 | + | |
| 71 | + call_user_func_array(array($worker, $job->getMethod()), $job->getArgs()); | |
| 72 | + | |
| 73 | + // Job finshed successfuly... do we remove the job from database? | |
| 74 | + $job->setStatus(Job::STATUS_SUCCESS); | |
| 75 | + $job->setMessage(null); | |
| 76 | + } | |
| 77 | +        catch (\Exception $e) { | |
| 78 | +            if ($this->logger) { | |
| 79 | +                $this->logger->debug("Failed: {$job->getClassName()}->{$job->getMethod()}\n{$e->getMessage()}"); | |
| 80 | + } | |
| 81 | + | |
| 82 | + $job->setStatus(Job::STATUS_ERROR); | |
| 83 | + $job->setMessage($e->getMessage() . "\n" .$e->getTraceAsString()); | |
| 84 | + } | |
| 85 | + | |
| 86 | + // save Job history | |
| 87 | + $elapsed = microtime(true) - $start; | |
| 88 | + $job->setElapsed($elapsed); | |
| 89 | + | |
| 90 | +        if ($this->logger) { | |
| 91 | +            $this->logger->debug("Finished: {$job->getClassName()}->{$job->getMethod()} in {$elapsed} micro-seconds"); | |
| 92 | +            $this->logger->debug("Save job history: {$job->getId()}"); | |
| 93 | + } | |
| 94 | + | |
| 95 | + $this->jobManager->saveHistory($job); | |
| 96 | 96 | $this->eventDispatcher->dispatch(Event::POST_JOB, $event); | 
| 97 | 97 | |
| 98 | - return $job; | |
| 99 | - } | |
| 98 | + return $job; | |
| 99 | + } | |
| 100 | 100 | } | 
| @@ -19,7 +19,7 @@ | ||
| 19 | 19 | $this->jobManager = new StaticJobManager(); | 
| 20 | 20 | $this->worker = new FibonacciWorker(); | 
| 21 | 21 | $this->worker->setJobManager($this->jobManager); | 
| 22 | - $this->eventDispatcher = new EventDispatcher(); | |
| 22 | + $this->eventDispatcher = new EventDispatcher(); | |
| 23 | 23 | $this->workerManager = new WorkerManager($this->jobManager, $this->eventDispatcher); | 
| 24 | 24 | } | 
| 25 | 25 | |