danog/MadelineProto
2
2
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Improve traces on web

Browse Source
This commit is contained in:
Daniil Gentili 2019-05-13 18:06:16 +02:00
parent da6e81ef3d
commit d18d97d208
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/danog/MadelineProto/TL/PrettyException.php
View File

@ -30,6 +30,8 @@ trait PrettyException
public function prettify_tl($init = '') public function prettify_tl($init = '')
{ {
$eol = PHP_EOL;
if (php_sapi_name() !== 'cli') $eol = '<br>'.PHP_EOL;
$tl = false; $tl = false;
foreach (array_reverse($this->getTrace()) as $k => $frame) { foreach (array_reverse($this->getTrace()) as $k => $frame) {
if (isset($frame['function']) && in_array($frame['function'], ['serialize_params', 'serialize_object'])) { if (isset($frame['function']) && in_array($frame['function'], ['serialize_params', 'serialize_object'])) {
@ -39,7 +41,7 @@ trait PrettyException
} }
} else { } else {
if ($tl) { if ($tl) {
$this->tl_trace .= PHP_EOL; $this->tl_trace .= $eol;
} }
if (isset($frame['function']) && ($frame['function'] === 'handle_rpc_error' && $k === count($this->getTrace()) - 1) || $frame['function'] === 'unserialize') { if (isset($frame['function']) && ($frame['function'] === 'handle_rpc_error' && $k === count($this->getTrace()) - 1) || $frame['function'] === 'unserialize') {
continue; continue;
@ -48,11 +50,11 @@ trait PrettyException
$this->tl_trace .= isset($frame['function']) ? $frame['function'].'(' : ''; $this->tl_trace .= isset($frame['function']) ? $frame['function'].'(' : '';
$this->tl_trace .= isset($frame['args']) ? substr(json_encode($frame['args']), 1, -1) : ''; $this->tl_trace .= isset($frame['args']) ? substr(json_encode($frame['args']), 1, -1) : '';
$this->tl_trace .= ')'; $this->tl_trace .= ')';
$this->tl_trace .= PHP_EOL; $this->tl_trace .= $eol;
$tl = false; $tl = false;
} }
} }
$this->tl_trace .= $init !== '' ? "['".$init."']" : ''; $this->tl_trace .= $init !== '' ? "['".$init."']" : '';
$this->tl_trace = implode(PHP_EOL, array_reverse(explode(PHP_EOL, $this->tl_trace))); $this->tl_trace = implode($eol, array_reverse(explode($eol, $this->tl_trace)));
} }
} }