Merge branch 'development' of github.com:mmoreramerino/GearmanBundle …

…into development Conflicts: Project/Reportings/codesniffer.log
mmoreram · Nov 28, 2011 · 9481701 · 9481701
2 parents 9b677fc + 13ff85f
commit 9481701
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 24 deletions.
diff --git a/Command/GearmanJobDescribeCommand.php b/Command/GearmanJobDescribeCommand.php
@@ -54,7 +54,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $job = $worker['job'];
         $output->writeln('<info>    @job\methodName : '.$job['methodName'].'</info>');
         $output->writeln('<info>    @job\callableName : '.$job['realCallableName'].'</info>');
-        $output->writeln('<info>    @job\iterations : '.$job['iter'].'</info>');
+        $output->writeln('<info>    @job\iterations : '.$job['iterations'].'</info>');
         $output->writeln('<info>    @job\servers :</info>');
         $output->writeln('');
         foreach ($job['servers'] as $name => $server) {

diff --git a/Driver/Gearman/GearmanAnnotations.php b/Driver/Gearman/GearmanAnnotations.php
@@ -31,7 +31,7 @@ final class Work extends Annotation
      *
      * @var integer
      */
-    public $iter = null;
+    public $iterations = null;
 
     /**
      * Servers assigned for all jobs of this work to be executed
@@ -71,7 +71,7 @@ final class Job extends Annotation
      *
      * @var integer
      */
-    public $iter = null;
+    public $iterations = null;
 
     /**
      * Servers assigned for this job to be executed

diff --git a/MmoreramerinoGearmanBundle.php b/MmoreramerinoGearmanBundle.php
@@ -35,7 +35,11 @@ public function boot()
         $gearmanCache = $this->container->get('gearman.cache');
         $existsCache = $gearmanCache->existsCacheFile();
 
-        if (in_array($this->container->get('kernel')->getEnvironment(), array('back_dev', 'back_test')) || !$existsCache) {
+        $environmentsCacheClear = array(
+            'back_dev', 'back_test', 'dev', 'test',
+        );
+
+        if (in_array($this->container->get('kernel')->getEnvironment(), $environmentsCacheClear) || !$existsCache) {
 
             if ($existsCache) {
                 $gearmanCache->emptyCache();

diff --git a/Module/JobClass.php b/Module/JobClass.php
@@ -49,24 +49,24 @@ public function __construct( Job $methodAnnotation, \ReflectionMethod $method, W
         $this->methodName   =   $method->getName();
 
         $this->realCallableName = str_replace('\\', '', $callableNameClass.'~'.$this->callableName);
-        $this->description  =    (null !== $method->getDocComment()) ?
+        $this->description  =    (null !== $methodAnnotation->description) ?
                                     $methodAnnotation->description :
                                     'No description is defined';
 
-        if (null !== $settings['defaults']['iter']) {
-            $iter = (int) ($settings['defaults']['iter']);
+        if (null !== $settings['defaults']['iterations']) {
+            $iter = (int) ($settings['defaults']['iterations']);
 
-            if (null !== $classAnnotation->iter) {
-                $iter = (int) ($classAnnotation->iter);
+            if (null !== $classAnnotation->iterations) {
+                $iter = (int) ($classAnnotation->iterations);
             }
 
-            if (null !== $methodAnnotation->iter) {
-                $iter = (int) ($methodAnnotation->iter);
+            if (null !== $methodAnnotation->iterations) {
+                $iter = (int) ($methodAnnotation->iterations);
             }
         } else {
-            throw new SettingValueMissingException('defaults/iter');
+            throw new SettingValueMissingException('defaults/iterations');
         }
-        $this->iter = $iter;
+        $this->iterations = $iter;
 
         /**
          * Servers definition for job
@@ -117,7 +117,7 @@ public function __toCache()
             'methodName'            =>  $this->methodName,
             'realCallableName'      =>  $this->realCallableName,
             'description'           =>  $this->description,
-            'iter'                  =>  $this->iter,
+            'iterations'			=>  $this->iterations,
             'servers'               =>  $this->servers,
         );
     }

diff --git a/Project/Reportings/codesniffer.log b/Project/Reportings/codesniffer.log
@@ -4,9 +4,9 @@ Time: 0 seconds, Memory: 4.00Mb
 
 Time: 0 seconds, Memory: 4.50Mb
 
-Time: 1 second, Memory: 5.25Mb
+Time: 0 seconds, Memory: 5.25Mb
 
-Time: 0 seconds, Memory: 4.75Mb
+Time: 1 second, Memory: 4.75Mb
 
 Time: 0 seconds, Memory: 5.00Mb
 
@@ -40,10 +40,10 @@ Time: 0 seconds, Memory: 4.50Mb
 
 Time: 0 seconds, Memory: 4.50Mb
 
-Time: 0 seconds, Memory: 4.50Mb
-
 Time: 1 second, Memory: 4.50Mb
 
+Time: 0 seconds, Memory: 4.50Mb
+
 Time: 0 seconds, Memory: 4.75Mb
 
 Time: 0 seconds, Memory: 5.25Mb

diff --git a/Project/dev.base.yml b/Project/dev.base.yml
@@ -27,4 +27,4 @@ defaults:
 
   # Default number of executions before job dies.
   # If annotations defined, will be overwritten
-  iter: 150
+  iterations: 150
diff --git a/Service/GearmanExecute.php b/Service/GearmanExecute.php
@@ -56,8 +56,8 @@ private function callJob(Array $worker)
 
         $gmworker->addFunction($job['realCallableName'], array($objInstance, $job['methodName']));
 
-        $iter = isset($job['iter']) ? (int) ($job['iter']) : 0;
-        $shouldStop = ($iter > 0) ? true : false;
+        $iterations = isset($job['iterations']) ? (int) ($job['iterations']) : 0;
+        $shouldStop = ($iterations > 0) ? true : false;
 
         while ($gmworker->work()) {
 
@@ -66,8 +66,8 @@ private function callJob(Array $worker)
             }
 
             if ($shouldStop) {
-                $iter--;
-                if ($iter <= 0) {
+                $iterations--;
+                if ($iterations <= 0) {
                     break;
                 }
             }

diff --git a/Workers/testWorker.php b/Workers/testWorker.php
@@ -11,7 +11,7 @@ class testWorker
      * 
      * @param \GearmanJob $job Object with job parameters
      *
-     * @Gearman\Job(iter=3, name="test", description="This is a description")     *
+     * @Gearman\Job(iterations=3, name="test", description="This is a description")     *
      */
     public function testA(\GearmanJob $job)
     {