wpstudio/majestic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Modified Profiler message.

Browse Source
This commit is contained in:
Alexander Demidov
2012-07-19 17:18:54 +04:00
parent a16a995ed3
commit 9d0e22ebd2
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/util/profiler/ProfilerTest.php
View File

@ -39,7 +39,7 @@ class ProfilerTest extends PHPUnit_Framework_TestCase
public function testGetInstaceNoDebug() public function testGetInstaceNoDebug()
{ {
Config::set('PROFILER', false); Config::set('PROFILER', false);
$this->setExpectedException('GeneralException', 'Need to turn on PROFILER before use.'); $this->setExpectedException('GeneralException', 'Need turn PROFILER before use.');
Profiler::getInstance(); Profiler::getInstance();
} }

8
util/profiler/Profiler.php
View File

@ -23,7 +23,7 @@ class Profiler
private function __construct() private function __construct()
{ {
if (Config::get('PROFILER') == false) { if (Config::get('PROFILER') == false) {
throw new GeneralException('Need to turn on PROFILER before use.'); throw new GeneralException('Need turn PROFILER before use.');
} }
} }
@ -82,7 +82,7 @@ class Profiler
$html = '<div style="clear:both; font:12px monospace; margin: 5px; white-space: pre;">' $html = '<div style="clear:both; font:12px monospace; margin: 5px; white-space: pre;">'
. 'Elapsed time: ' . round(($this->end - $this->start) * 1000, 2) . 'ms.<br/>'; . 'Elapsed time: ' . round(($this->end - $this->start) * 1000, 2) . 'ms.<br/>';
if (count($this->queries) == 0 && !Config::get('PROFILER_DETAILS')) { if (count($this->queries) == 0 && !Config::get('PROFILER_DETAILS')) {
$html .= 'Queries not counted. Turn PROFILER_DETAILS on true, if you want to profile queries.<br>'; $html .= 'Queries not counted. Turn PROFILER_DETAILS if you want to profile queries.<br/>';
} else { } else {
$html .= 'Queries: ' . count($this->queries) . ' [' . round($queriesTime * 1000, 2) . ' ms]<br/>'; $html .= 'Queries: ' . count($this->queries) . ' [' . round($queriesTime * 1000, 2) . ' ms]<br/>';
} }
@ -104,7 +104,7 @@ class Profiler
$queriesTime += $query->getElapsed(); $queriesTime += $query->getElapsed();
} }
if (count($this->queries) == 0 && !Config::get('PROFILER_DETAILS')) { if (count($this->queries) == 0 && !Config::get('PROFILER_DETAILS')) {
FB::table('Queries not counted. Turn PROFILER_DETAILS on true, if you want to profile queries.', $table); FB::table('Queries not counted. Turn PROFILER_DETAILS if you want to profile queries.', $table);
} else { } else {
FB::table('Queries: ' . count($this->queries) . ' [' . round($queriesTime * 1000, 2) . ' ms]', $table); FB::table('Queries: ' . count($this->queries) . ' [' . round($queriesTime * 1000, 2) . ' ms]', $table);
} }
@ -122,7 +122,7 @@ class Profiler
$html = str_pad(PHP_EOL, 60, '-', STR_PAD_LEFT); $html = str_pad(PHP_EOL, 60, '-', STR_PAD_LEFT);
$html .= 'Elapsed time: ' . round(($this->end - $this->start) * 1000, 2) . 'ms.' . PHP_EOL; $html .= 'Elapsed time: ' . round(($this->end - $this->start) * 1000, 2) . 'ms.' . PHP_EOL;
if (count($this->queries) == 0 && !Config::get('PROFILER_DETAILS')) { if (count($this->queries) == 0 && !Config::get('PROFILER_DETAILS')) {
$html .= 'Queries not counted. Turn PROFILER_DETAILS on true, if you want to profile queries.' . PHP_EOL; $html .= 'Queries not counted. Turn PROFILER_DETAILS if you want to profile queries.' . PHP_EOL;
} else { } else {
$html .= 'Queries: ' . count($this->queries) . ' [' . round($queriesTime * 1000, 2) . ' ms] ' . PHP_EOL; $html .= 'Queries: ' . count($this->queries) . ' [' . round($queriesTime * 1000, 2) . ' ms] ' . PHP_EOL;
} }