Fix: minor fixs

spiritdead · May 20, 2017 · d23e4e7 · d23e4e7
1 parent 2c53897
commit d23e4e7
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 7 deletions.
diff --git a/components/workers/ResqueWorker.php b/components/workers/ResqueWorker.php
@@ -181,18 +181,19 @@ public function startup()
      *
      * @param Resque $resqueInst
      * @param string $workerId The ID of the worker.
-     * @return boolean|ResqueWorkerBase|ResqueWorkerInterface Instance of the worker. False if the worker does not exist.
+     * @return null|ResqueWorkerBase|ResqueWorkerInterface Instance of the worker. False if the worker does not exist.
      */
     public static function find($resqueInst, $workerId)
     {
         if (!self::exists($resqueInst, $workerId) || false === strpos($workerId, ":")) {
-            return false;
+            return null;
         }
 
-
         $worker = new self($resqueInst);
-        $worker->restore($workerId);
-        return $worker;
+        if($worker->restore($workerId)) {
+            return $worker;
+        }
+        return null;
     }
 
     /**
@@ -206,7 +207,10 @@ public static function all($resqueInst)
         $workers = [];
         if (is_array($workersRaw) && count($workersRaw) > 0) {
             foreach ($workersRaw as $workerId) {
-                $workers[] = self::find($resqueInst, $workerId);
+                $worker = self::find($resqueInst, $workerId);
+                if(isset($worker)) {
+                    $workers[] = $worker;
+                }
             }
         }
         return $workers;

diff --git a/components/workers/base/ResqueWorkerBase.php b/components/workers/base/ResqueWorkerBase.php
@@ -120,13 +120,15 @@ public function __construct(Resque $resqueInst, $queues = '*')
     /**
      * Method for regenerate worker from the current ID saved in the redis and the instance in the server
      * @param $workerInstance
+     * @return boolean // Success or Fail
      */
     public function restore($workerInstance)
     {
         list($hostname, $pid, $queues) = explode(':', $workerInstance, 3);
         if (!is_array($queues)) {
             $queues = explode(',', $queues);
         }
+
         $this->queues = $queues;
         $this->pid = $pid;
         $this->id = $workerInstance; //regenerate worker
@@ -135,6 +137,12 @@ public function restore($workerInstance)
             $data = json_decode($data, true);
             $this->currentJob = new ResqueJobBase($this->resqueInstance, $data['queue'], $data['payload'], true);
         }
+        $workerPids = self::workerPids();
+        if (!in_array($pid, $workerPids)) {
+            $this->unregisterWorker();
+            return false;
+        }
+        return true;
     }
 
     /**

diff --git a/plugins/schedule/workers/ResqueWorkerScheduler.php b/plugins/schedule/workers/ResqueWorkerScheduler.php
@@ -60,7 +60,10 @@ public static function all($resqueInst)
         $workers = [];
         if (is_array($workersRaw) && count($workersRaw) > 0) {
             foreach ($workersRaw as $workerId) {
-                $workers[] = self::find($resqueInst, $workerId);
+                $worker = self::find($resqueInst, $workerId);
+                if(isset($worker)) {
+                    $workers[] = $worker;
+                }
             }
         }
         return $workers;