From 45db6001ea5f15eb6b8a6a7a757a6ba4a3eaeb47 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 23 Jul 2013 12:57:28 -0700
Subject: [PATCH] Use PhutilProxyException to disambiguate work queue failures

Summary: Fixes T2569. This is the other common exception source which is ambiguous. List the task ID explicitly to make debugging easier.

Test Plan: {F51268}

Reviewers: btrahan

Reviewed By: btrahan

CC: aran

Maniphest Tasks: T2569

Differential Revision: https://secure.phabricator.com/D6549
---
 .../daemon/workers/PhabricatorTaskmasterDaemon.php            | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/infrastructure/daemon/workers/PhabricatorTaskmasterDaemon.php b/src/infrastructure/daemon/workers/PhabricatorTaskmasterDaemon.php
index da1df283f9..8726263355 100644
--- a/src/infrastructure/daemon/workers/PhabricatorTaskmasterDaemon.php
+++ b/src/infrastructure/daemon/workers/PhabricatorTaskmasterDaemon.php
@@ -23,7 +23,9 @@ final class PhabricatorTaskmasterDaemon extends PhabricatorDaemon {
               $this->log("Task {$id} failed permanently.");
             } else {
               $this->log("Task {$id} failed!");
-              throw $ex;
+              throw new PhutilProxyException(
+                "Error while executing task ID {$id} from queue.",
+                $ex);
             }
           } else {
             $this->log("Task {$id} complete! Moved to archive.");