Move trigger call for onFailure in to ->fail(), so it can catch PHP errors

Author: chris.boulton

lib/Resque/Job.php

@@ -188,15 +188,6 @@ public function perform()
 		catch(Resque_Job_DontPerform $e) {
 			return false;
 		}
-		// Catch any other exception and raise the onFailure event. Rethrow
-		// the exception
-		catch(Exception $e) {
-			Resque_Event::trigger('onFailure', array(
-				'exception' => $e,
-				'job' => $this,
-			));
-			throw $e;
-		}
 
 		return true;
 	}
@@ -206,6 +197,11 @@ public function perform()
 	 */
 	public function fail($exception)
 	{
+		Resque_Event::trigger('onFailure', array(
+			'exception' => $exception,
+			'job' => $this,
+		));
+
 		$this->updateStatus(Resque_Job_Status::STATUS_FAILED);
 		require_once dirname(__FILE__) . '/Failure.php';
 		Resque_Failure::create(