'),
$console);
}
return "\n\n\n\n".$console."\n\n\n\n";
}
}
diff --git a/src/aphront/console/plugin/errorlog/DarkConsoleErrorLogPlugin.php b/src/aphront/console/plugin/errorlog/DarkConsoleErrorLogPlugin.php
index 0f140f582..a3352c502 100644
--- a/src/aphront/console/plugin/errorlog/DarkConsoleErrorLogPlugin.php
+++ b/src/aphront/console/plugin/errorlog/DarkConsoleErrorLogPlugin.php
@@ -1,138 +1,161 @@
getData());
if ($count) {
return
'• '.
"Error Log ({$count})";
}
return 'Error Log';
}
public function getDescription() {
return 'Shows errors and warnings.';
}
public function generateData() {
return DarkConsoleErrorLogPluginAPI::getErrors();
}
public function render() {
$data = $this->getData();
$rows = array();
- foreach ($data as $row) {
- switch ($row['event']) {
- case 'error':
- $file = $row['file'];
- $line = $row['line'];
- break;
- case 'exception':
- $file = $row['exception']->getFile();
- $line = $row['exception']->getLine();
- break;
- }
+ $details = '';
+
+ foreach ($data as $index => $row) {
+ $file = $row['file'];
+ $line = $row['line'];
+
+ $tag = phutil_render_tag(
+ 'a',
+ array(
+ 'onclick' => jsprintf('show_details(%d)', $index),
+ ),
+ phutil_escape_html($row['str'].' at ['.basename($file).':'.$line.']'));
+ $rows[] = array($tag);
+
+ $details .=
+ ''.
+ phutil_escape_html($row['details'])."\n".
+ 'Stack trace:'."\n";
+
+ foreach ($row['trace'] as $key => $entry) {
+ $line = '';
+ if (isset($entry['class'])) {
+ $line .= $entry['class'].'::';
+ }
+ $line .= idx($entry, 'function', '');
+ $onclick = '';
+ if (isset($entry['file'])) {
+ $line .= ' called at ['.$entry['file'].':'.$entry['line'].']';
+ $onclick = jsprintf(
+ 'open_file(%s, %d)', $entry['file'], $entry['line']);
+ }
+ $details .= phutil_render_tag(
+ 'a',
+ array(
+ 'onclick' => $onclick,
+ ),
+ phutil_escape_html($line));
+ $details .= "\n";
+ }
- $rows[] = array(
- basename($file).':'.$line,
- $row['str'],
- );
+ $details .= '
';
}
$table = new AphrontTableView($rows);
- $table->setColumnClasses(
- array(
- null,
- 'wide wrap',
- ));
- $table->setHeaders(
- array(
- 'File',
- 'Error',
- ));
+ $table->setClassName('error-log');
+ $table->setHeaders(array('Error'));
$table->setNoDataString('No errors.');
- return $table->render();
+ return ''.
+ '
'.$table->render().'
'.
+ '
'.
+ '
'.
+ $details.'
'.
+ '
No errors.
;
}
$markup = ;
$alt = false;
foreach ($data as $error) {
$row = |
;
$text = $error['error'];
$text = preg_replace('/\(in .* on line \d+\)$/', '', trim($text));
$trace = $error['trace'];
$trace = explode("\n", $trace);
if (!$trace) {
$trace = array('unknown@0@unknown');
}
foreach ($trace as $idx => $traceline) {
list($file, $line, $where) = array_merge(
explode('@', $traceline),
array('?', '?', '?'));
if ($where == 'DarkConsole->addError' ||
$where == 'debug_rlog') {
unset($trace[$idx]);
}
}
$row->appendChild({$text} | );
foreach ($trace as $traceline) {
list($file, $line, $where) = array_merge(
explode('@', $traceline),
array('?', '?', '?'));
$row->appendChild({$file}:{$line} | );
$row->appendChild({$where}() | );
$markup->appendChild($row);
$row = |
;
}
$alt = !$alt;
}
return
Errors
{$markup}
;
*/
diff --git a/src/aphront/console/plugin/errorlog/__init__.php b/src/aphront/console/plugin/errorlog/__init__.php
index 6b52c92de..cb560b187 100644
--- a/src/aphront/console/plugin/errorlog/__init__.php
+++ b/src/aphront/console/plugin/errorlog/__init__.php
@@ -1,14 +1,18 @@
'error',
- 'num' => $num,
- 'str' => $str,
- 'file' => $file,
- 'line' => $line,
- 'cxt' => $cxt,
- 'trace' => debug_backtrace(),
- );
+ public static function handleErrors($event, $value, $metadata) {
+ if (self::$discardMode) {
+ return;
}
- error_log("{$file}:{$line} {$str}");
- }
- public static function handleException($ex) {
- if (!self::$discardMode) {
- self::$errors[] = array(
- 'event' => 'exception',
- 'exception' => $ex,
- );
+ switch ($event) {
+ case PhutilErrorHandler::EXCEPTION:
+ // $value is of type Exception
+ self::$errors[] = array(
+ 'details' => $value->getMessage(),
+ 'event' => $event,
+ 'file' => $value->getFile(),
+ 'line' => $value->getLine(),
+ 'str' => $value->getMessage(),
+ 'trace' => $metadata['trace'],
+ );
+ break;
+ case PhutilErrorHandler::ERROR:
+ // $value is a simple string
+ self::$errors[] = array(
+ 'details' => $value,
+ 'event' => $event,
+ 'file' => $metadata['file'],
+ 'line' => $metadata['line'],
+ 'str' => $value,
+ 'trace' => $metadata['trace'],
+ );
+ break;
+ case PhutilErrorHandler::PHLOG:
+ // $value can be anything
+ self::$errors[] = array(
+ 'details' => PhutilReadableSerializer::printShallow($value, 3),
+ 'event' => $event,
+ 'file' => $metadata['file'],
+ 'line' => $metadata['line'],
+ 'str' => PhutilReadableSerializer::printShort($value),
+ 'trace' => $metadata['trace'],
+ );
+ break;
+ default:
+ error_log('Unknown event : '.$event);
+ break;
}
- error_log($ex);
}
}
+
diff --git a/src/aphront/console/plugin/errorlog/api/__init__.php b/src/aphront/console/plugin/errorlog/api/__init__.php
index f4f7b7ffb..428c8500c 100644
--- a/src/aphront/console/plugin/errorlog/api/__init__.php
+++ b/src/aphront/console/plugin/errorlog/api/__init__.php
@@ -1,10 +1,13 @@
request = $request;
return $this;
}
public function getRequest() {
return $this->request;
}
public function setApplicationName($application_name) {
$this->applicationName = $application_name;
return $this;
}
public function getApplicationName() {
return $this->applicationName;
}
public function setBaseURI($base_uri) {
$this->baseURI = $base_uri;
return $this;
}
public function getBaseURI() {
return $this->baseURI;
}
public function setTabs(array $tabs, $selected_tab) {
$this->tabs = $tabs;
$this->selectedTab = $selected_tab;
return $this;
}
public function getTitle() {
$use_glyph = true;
$request = $this->getRequest();
if ($request) {
$user = $request->getUser();
if ($user && $user->loadPreferences()->getPreference(
PhabricatorUserPreferences::PREFERENCE_TITLES) !== 'glyph') {
$use_glyph = false;
}
}
return ($use_glyph ?
$this->getGlyph() : '['.$this->getApplicationName().']').
' '.parent::getTitle();
}
protected function willRenderPage() {
if (!$this->getRequest()) {
throw new Exception(
"You must set the Request to render a PhabricatorStandardPageView.");
}
$console = $this->getRequest()->getApplicationConfiguration()->getConsole();
require_celerity_resource('phabricator-core-css');
require_celerity_resource('phabricator-core-buttons-css');
require_celerity_resource('phabricator-standard-page-view');
require_celerity_resource('javelin-lib-dev');
require_celerity_resource('javelin-workflow-dev');
Javelin::initBehavior('workflow', array());
if ($console) {
require_celerity_resource('aphront-dark-console-css');
Javelin::initBehavior(
'dark-console',
array(
'uri' => '/~/',
));
+
+ // Change this to initBehavior when there is some behavior to initialize
+ require_celerity_resource('javelin-behavior-error-log');
}
$this->bodyContent = $this->renderChildren();
}
protected function getHead() {
$response = CelerityAPI::getStaticResourceResponse();
$head =
''.
$response->renderResourcesOfType('css').
'';
$request = $this->getRequest();
if ($request) {
$user = $request->getUser();
if ($user) {
$monospaced = $user->loadPreferences()->getPreference(
PhabricatorUserPreferences::PREFERENCE_MONOSPACED
);
if (strlen($monospaced)) {
$head .=
'';
}
}
}
return $head;
}
public function setGlyph($glyph) {
$this->glyph = $glyph;
return $this;
}
public function getGlyph() {
return $this->glyph;
}
protected function willSendResponse($response) {
$console = $this->getRequest()->getApplicationConfiguration()->getConsole();
if ($console) {
$response = str_replace(
'',
$console->render($this->getRequest()),
$response);
}
return $response;
}
protected function getBody() {
$console = $this->getRequest()->getApplicationConfiguration()->getConsole();
$tabs = array();
foreach ($this->tabs as $name => $tab) {
$tab_markup = phutil_render_tag(
'a',
array(
'href' => idx($tab, 'href'),
),
phutil_escape_html(idx($tab, 'name')));
$tab_markup = phutil_render_tag(
'td',
array(
'class' => ($name == $this->selectedTab)
? 'phabricator-selected-tab'
: null,
),
$tab_markup);
$tabs[] = $tab_markup;
}
$tabs = implode('', $tabs);
$login_stuff = null;
$request = $this->getRequest();
$user = null;
if ($request) {
$user = $request->getUser();
// NOTE: user may not be set here if we caught an exception early
// in the execution workflow.
if ($user && $user->getPHID()) {
$login_stuff =
'Logged in as '.phutil_render_tag(
'a',
array(
'href' => '/p/'.$user->getUsername().'/',
),
phutil_escape_html($user->getUsername())).
' · '.
'Settings'.
' · '.
phabricator_render_form(
$user,
array(
'action' => '/search/',
'method' => 'post',
'style' => 'display: inline',
),
''.
'');
}
}
$foot_links = array();
$version = PhabricatorEnv::getEnvConfig('phabricator.version');
$foot_links[] = phutil_escape_html('Phabricator '.$version);
if (PhabricatorEnv::getEnvConfig('darkconsole.enabled') &&
!PhabricatorEnv::getEnvConfig('darkconsole.always-on')) {
if ($console) {
$link = javelin_render_tag(
'a',
array(
'href' => '/~/',
'sigil' => 'workflow',
),
'Disable DarkConsole');
} else {
$link = javelin_render_tag(
'a',
array(
'href' => '/~/',
'sigil' => 'workflow',
),
'Enable DarkConsole');
}
$foot_links[] = $link;
}
if ($user && $user->getPHID()) {
// This ends up very early in tab order at the top of the page and there's
// a bunch of junk up there anyway, just shove it down here.
$foot_links[] = phabricator_render_form(
$user,
array(
'action' => '/logout/',
'method' => 'post',
'style' => 'display: inline',
),
'');
}
$foot_links = implode(' · ', $foot_links);
return
($console ? '' : null).
''.
'
'.
'
'.
$login_stuff.
'
'.
'
'.
''.
'| '.
''.
"Phabricat\xE2\x9A\x99r".
' '.
' | '.
''.
phutil_render_tag(
'a',
array(
'href' => $this->getBaseURI(),
'class' => 'phabricator-head-appname',
),
phutil_escape_html($this->getApplicationName())).
' | '.
$tabs.
'
'.
'
'.
'
'.
$this->bodyContent.
'
'.
'