D13150.diff
No OneTemporary
Actions

Size

983 B

Referenced Files

None

Subscribers

None

D13150.diff
View Options

	diff --git a/src/error/phlog.php b/src/error/phlog.php
	--- a/src/error/phlog.php
	+++ b/src/error/phlog.php
	@@ -20,12 +20,20 @@
	);

	foreach (func_get_args() as $event) {
	- PhutilErrorHandler::dispatchErrorMessage(
	- $event instanceof Exception
	- ? PhutilErrorHandler::EXCEPTION
	- : PhutilErrorHandler::PHLOG,
	- $event,
	- $metadata);
	+ $data = $metadata;
	+ if ($event instanceof Exception) {
	+ $type = PhutilErrorHandler::EXCEPTION;
	+ // If this is an exception, proxy it and generate a composite trace which
	+ // shows both where the phlog() was called and where the exception was
	+ // originally thrown from.
	+ $proxy = new PhutilProxyException('', $event);
	+ $trace = PhutilErrorHandler::getExceptionTrace($proxy);
	+ $data['trace'] = $trace;
	+ } else {
	+ $type = PhutilErrorHandler::PHLOG;
	+ }
	+
	+ PhutilErrorHandler::dispatchErrorMessage($type, $event, $data);
	}

	return $value;