Page MenuHomePhabricator
Files F18884097

D8022.id18162.diff
No OneTemporary
Actions

D8022.id18162.diff
View Options

Index: support/PhabricatorStartup.php
===================================================================
--- support/PhabricatorStartup.php
+++ support/PhabricatorStartup.php
@@ -198,9 +198,54 @@
/**
+ * Fatal the request completely in response to an exception, sending a plain
+ * text message to the client. Calls @{method:didFatal} internally.
+ *
+ * @param string Brief description of the exception context, like
+ * `"Rendering Exception"`.
+ * @param Exception The exception itself.
+ * @param bool True if it's okay to show the exception's stack trace
+ * to the user. The trace will always be logged.
+ * @return exit This method **does not return**.
+ *
* @task apocalypse
*/
- public static function didFatal($message) {
+ public static function didEncounterFatalException(
+ $note,
+ Exception $ex,
+ $show_trace) {
+
+ $message = '['.$note.'/'.get_class($ex).'] '.$ex->getMessage();
+
+ $full_message = $message;
+ $full_message .= "\n\n";
+ $full_message .= $ex->getTraceAsString();
+
+ if ($show_trace) {
+ $message = $full_message;
+ }
+
+ self::didFatal($message, $full_message);
+ }
+
+
+ /**
+ * Fatal the request completely, sending a plain text message to the client.
+ *
+ * @param string Plain text message to send to the client.
+ * @param string Plain text message to send to the error log. If not
+ * provided, the client message is used. You can pass a more
+ * detailed message here (e.g., with stack traces) to avoid
+ * showing it to users.
+ * @return exit This method **does not return**.
+ *
+ * @task apocalypse
+ */
+ public static function didFatal($message, $log_message = null) {
+ if ($log_message === null) {
+ $log_message = $message;
+ }
+
self::endOutputCapture();
$access_log = self::getGlobal('log.access');
@@ -219,7 +264,7 @@
$replace = true,
$http_error = 500);
- error_log($message);
+ error_log($log_message);
echo $message;
exit(1);
Index: webroot/index.php
===================================================================
--- webroot/index.php
+++ webroot/index.php
@@ -3,10 +3,13 @@
require_once dirname(dirname(__FILE__)).'/support/PhabricatorStartup.php';
PhabricatorStartup::didStartup();
+$show_unexpected_traces = false;
try {
PhabricatorStartup::loadCoreLibraries();
PhabricatorEnv::initializeWebEnvironment();
+ $show_unexpected_traces = PhabricatorEnv::getEnvConfig(
+ 'phabricator.developer-mode');
// This is the earliest we can get away with this, we need env config first.
PhabricatorAccessLog::init();
@@ -124,7 +127,10 @@
$ex,
));
}
- PhabricatorStartup::didFatal('[Rendering Exception] '.$ex->getMessage());
+ PhabricatorStartup::didEncounterFatalException(
+ 'Rendering Exception',
+ $ex,
+ $show_unexpected_traces);
}
$write_guard->dispose();
@@ -137,6 +143,9 @@
DarkConsoleXHProfPluginAPI::saveProfilerSample($access_log);
} catch (Exception $ex) {
- PhabricatorStartup::didFatal("[Exception] ".$ex->getMessage());
+ PhabricatorStartup::didEncounterFatalException(
+ 'Core Exception',
+ $ex,
+ $show_unexpected_traces);
}

File Metadata

Mime Type
text/plain
Expires
Nov 8 2025, 12:35 AM (9 w, 2 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
8654396
Default Alt Text
D8022.id18162.diff (3 KB)

Event Timeline

Phabricator · Built by Phacility