From f19924310431e29e4e7bf8ae5f9694f038aa2b5b Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Wed, 23 Nov 2016 10:29:53 -0800
Subject: [PATCH] Clean up another insufficiently-general exception

Summary:
Ref T11044. This is still catching the older exceptions, which are now more general.

If you loaded the web UI without MySQL running, this meant you got a less-helpful error.

Test Plan: Stopped MySQL, loaded web UI, got a more-helpful error.

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T11044

Differential Revision: https://secure.phabricator.com/D16930
---
 src/aphront/configuration/AphrontApplicationConfiguration.php | 4 +---
 src/applications/config/issue/PhabricatorSetupIssue.php       | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/aphront/configuration/AphrontApplicationConfiguration.php b/src/aphront/configuration/AphrontApplicationConfiguration.php
index 939102e5ca..c39dd2033a 100644
--- a/src/aphront/configuration/AphrontApplicationConfiguration.php
+++ b/src/aphront/configuration/AphrontApplicationConfiguration.php
@@ -81,9 +81,7 @@ abstract class AphrontApplicationConfiguration extends Phobject {
     try {
       PhabricatorEnv::initializeWebEnvironment();
       $database_exception = null;
-    } catch (AphrontInvalidCredentialsQueryException $ex) {
-      $database_exception = $ex;
-    } catch (AphrontConnectionQueryException $ex) {
+    } catch (PhabricatorClusterStrandedException $ex) {
       $database_exception = $ex;
     }
 
diff --git a/src/applications/config/issue/PhabricatorSetupIssue.php b/src/applications/config/issue/PhabricatorSetupIssue.php
index a3d024a728..a2e9532ede 100644
--- a/src/applications/config/issue/PhabricatorSetupIssue.php
+++ b/src/applications/config/issue/PhabricatorSetupIssue.php
@@ -22,7 +22,7 @@ final class PhabricatorSetupIssue extends Phobject {
   private $links;
 
   public static function newDatabaseConnectionIssue(
-    AphrontQueryException $ex,
+    Exception $ex,
     $is_fatal) {
 
     $message = pht(