Merge pull request #1433 from tomaszdurka/issue-1433

Make _registerJobs protected
cargomedia · Oct 7, 2014 · 58c455d · 58c455d
2 parents 665d45c + 062a132
commit 58c455d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/library/CM/Jobdistribution/Cli.php b/library/CM/Jobdistribution/Cli.php
@@ -7,6 +7,10 @@ class CM_Jobdistribution_Cli extends CM_Cli_Runnable_Abstract {
      */
     public function startWorker() {
         $worker = new CM_Jobdistribution_JobWorker();
+        foreach (CM_Jobdistribution_Job_Abstract::getClassChildren() as $jobClassName) {
+            $job = new $jobClassName();
+            $worker->registerJob($job);
+        }
         $worker->run();
     }
 

diff --git a/library/CM/Jobdistribution/JobWorker.php b/library/CM/Jobdistribution/JobWorker.php
@@ -14,7 +14,13 @@ public function __construct() {
         //use non-blocking IO mode to enable signal processing in worker processes as soon as libgearman/pecl gearman is fixed
         //see https://bugs.php.net/bug.php?id=60764
         //$this->_gearmanWorker->addOptions(GEARMAN_WORKER_NON_BLOCKING);
-        $this->_registerJobs();
+    }
+
+    /**
+     * @param CM_Jobdistribution_Job_Abstract $job
+     */
+    public function registerJob(CM_Jobdistribution_Job_Abstract $job) {
+        $this->_gearmanWorker->addFunction(get_class($job), array($job, '__executeGearman'));
     }
 
     public function run() {
@@ -51,11 +57,4 @@ protected function _getGearmanWorker() {
         }
         return $this->_gearmanWorker;
     }
-
-    private function _registerJobs() {
-        foreach (CM_Jobdistribution_Job_Abstract::getClassChildren() as $jobClassName) {
-            $job = new $jobClassName();
-            $this->_gearmanWorker->addFunction($jobClassName, array($job, '__executeGearman'));
-        }
-    }
 }