CS-5484: Adds configuration option for jobby environment variable

sourcefabric · Oct 15, 2014 · 7dcd534 · 7dcd534
1 parent 7204b85
commit 7dcd534
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 6 deletions.
diff --git a/newscoop/application/configs/parameters/parameters.yml b/newscoop/application/configs/parameters/parameters.yml
@@ -149,3 +149,5 @@ parameters:
     search.article:
         type: ["news"]
         rendition: ''
+    jobby:
+        environment: 'prod'
diff --git a/newscoop/application/configs/parameters/parameters_cli.yml b/newscoop/application/configs/parameters/parameters_cli.yml
@@ -4,4 +4,6 @@ parameters:
             acl:
                 cache: "Doctrine\Common\Cache\ArrayCache"
     doctrine:
-        cache: "array"
+        cache: "array"
+    jobby:
+        environment: 'cli'
diff --git a/newscoop/application/configs/parameters/parameters_development.yml b/newscoop/application/configs/parameters/parameters_development.yml
@@ -13,4 +13,6 @@ parameters:
             params:
                 displayExceptions: "1"
     session:
-        cookie_domain: ""
+        cookie_domain: ""
+    jobby:
+        environment: 'dev'
diff --git a/newscoop/application/configs/parameters/parameters_testing.yml b/newscoop/application/configs/parameters/parameters_testing.yml
@@ -37,3 +37,5 @@ parameters:
         frontController:
             params:
                 displayExceptions: true
+    jobby:
+        environment: 'test'
diff --git a/newscoop/library/Newscoop/Services/SchedulerService.php b/newscoop/library/Newscoop/Services/SchedulerService.php
@@ -55,10 +55,6 @@ public function registerJob($jobName, array $config)
                     $cronJob->{$setter}($value);
                 }
 
-                if (array_key_exists('environment', $this->$config) && !empty($this->config['environment'])) {
-                    $cronJob->setEnvironment($this->config['environment']);
-                }
-
                 $cronJob->setName($jobName);
                 $this->em->persist($cronJob);
                 $this->em->flush($cronJob);
@@ -96,6 +92,10 @@ public function removeJob($jobName, array $config)
      */
     public function addSchedulerJob($jobName, array $config)
     {
+        if (array_key_exists('environment', $this->config) && !empty($this->config['environment'])) {
+            $config['environment'] = $this->config['environment'];
+        }
+
         $this->jobby->add($jobName, $config);
     }