Fail job on segmentation fault (#6)

* let a worker fail a job when a segmentation fault is detected (abnormal child exit)
* added missing log level
* formatting

Author: 050media

lib/Resque/Worker.php

@@ -218,8 +218,10 @@ public function work($interval = Resque::DEFAULT_INTERVAL, $blocking = false)
 
 				// Wait until the child process finishes before continuing
 				pcntl_wait($status);
-				$exitStatus = pcntl_wexitstatus($status);
-				if($exitStatus !== 0) {
+
+				if (pcntl_wifexited($status) !== true) {
+					$job->fail(new Resque_Job_DirtyExitException('Job exited abnormally'));
+				} elseif (($exitStatus = pcntl_wexitstatus($status)) !== 0) {
 					$job->fail(new Resque_Job_DirtyExitException(
 						'Job exited with exit code ' . $exitStatus
 					));
@@ -229,7 +231,7 @@ public function work($interval = Resque::DEFAULT_INTERVAL, $blocking = false)
 					if (in_array($job->getStatus(), array(Resque_Job_Status::STATUS_WAITING, Resque_Job_Status::STATUS_RUNNING)))
 					{
 						$job->updateStatus(Resque_Job_Status::STATUS_COMPLETE);
-						$this->logger->log('done ' . $job);
+						$this->logger->log(Psr\Log\LogLevel::INFO, 'done ' . $job);
 					}
 				}
 			}

test/Resque/Tests/WorkerTest.php

@@ -290,4 +290,15 @@ public function testBlockingListPop()
 
         $this->assertEquals(2, $i);
     }
+
+    public function testWorkerFailsSegmentationFaultJob()
+    {
+        Resque::enqueue('jobs', 'Test_Infinite_Recursion_Job');
+
+        $worker = new Resque_Worker('jobs');
+        $worker->setLogger(new Resque_Log());
+        $worker->work(0);
+
+        $this->assertEquals(1, Resque_Stat::get('failed'));
+    }
 }

test/bootstrap.php

@@ -145,4 +145,12 @@ public function tearDown()
 	{
 		self::$called = true;
 	}
+}
+
+class Test_Infinite_Recursion_Job
+{
+    public function perform()
+    {
+        $this->perform();
+    }
 }