revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-12-24 14:30:56 +01:00
Code Issues Releases Wiki Activity

Clean up another insufficiently-general exception

Browse source 
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
This commit is contained in:
epriestley 2016-11-23 10:29:53 -08:00
parent ce18a8e208
commit f199243104
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/aphront/configuration/AphrontApplicationConfiguration.php
View file

@ -81,9 +81,7 @@ abstract class AphrontApplicationConfiguration extends Phobject {
try { try {
PhabricatorEnv::initializeWebEnvironment(); PhabricatorEnv::initializeWebEnvironment();
$database_exception = null; $database_exception = null;
} catch (AphrontInvalidCredentialsQueryException $ex) { } catch (PhabricatorClusterStrandedException $ex) {
$database_exception = $ex;
} catch (AphrontConnectionQueryException $ex) {
$database_exception = $ex; $database_exception = $ex;
} }

2
src/applications/config/issue/PhabricatorSetupIssue.php
View file

@ -22,7 +22,7 @@ final class PhabricatorSetupIssue extends Phobject {
private $links; private $links;
public static function newDatabaseConnectionIssue( public static function newDatabaseConnectionIssue(
AphrontQueryException $ex, Exception $ex,
$is_fatal) { $is_fatal) {
$message = pht( $message = pht(