The branch, master has been updated via 88879b37fa414e52bac4c100e4a6cf41ae376fe1 (commit) via 9b4eb98968cb316390e15dee200b80a324be8c25 (commit) via d7bedfd5b103a9bb2419caca23197ce2d8a572f9 (commit) from 7327dab9361aa7095fc2c92f0489f8c8a159508d (commit)
- Log ----------------------------------------------------------------- commit 88879b37fa414e52bac4c100e4a6cf41ae376fe1 Author: Michal Čihař michal@cihar.com Date: Mon Aug 15 10:06:18 2011 +0200
Split long text, use <strong> instead of <b>
commit 9b4eb98968cb316390e15dee200b80a324be8c25 Author: Michal Čihař michal@cihar.com Date: Mon Aug 15 10:04:00 2011 +0200
Split up long string
commit d7bedfd5b103a9bb2419caca23197ce2d8a572f9 Author: Michal Čihař michal@cihar.com Date: Mon Aug 15 10:03:52 2011 +0200
Whitespace cleanup
-----------------------------------------------------------------------
Summary of changes: server_status.php | 54 +++++++++++++++++++++++++++++++++++++++------------- 1 files changed, 40 insertions(+), 14 deletions(-)
diff --git a/server_status.php b/server_status.php index cdbe9bb..e7d104b 100644 --- a/server_status.php +++ b/server_status.php @@ -81,7 +81,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) {
exit(json_encode($ret));
- // Data for the monitor + // Data for the monitor case 'chartgrid': $ret = json_decode($_REQUEST['requiredData'], true); $statusVars = array(); @@ -92,12 +92,12 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { /* Accumulate all required variables and data */ // For each chart foreach ($ret as $chart_id => $chartNodes) { - // For each data series + // For each data series foreach ($chartNodes as $node_id => $nodeDataPoints) { // For each data point in the series (usually just 1) foreach ($nodeDataPoints as $point_id => $dataPoint) { $pName = $dataPoint['name']; - + switch ($dataPoint['type']) { /* We only collect the status and server variables here to * read them all in one query, and only afterwards assign them. @@ -105,7 +105,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { */ case 'servervar': if (!preg_match('/[^a-zA-Z_]+/', $pName)) - $serverVars[] = $pName; + $serverVars[] = $pName; break;
case 'statusvar': @@ -157,7 +157,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { } else { $statusVarValues = array(); } - + // Retrieve all required server variables if (count($serverVars)) { $serverVarValues = PMA_DBI_fetch_result( @@ -803,7 +803,17 @@ echo __('Runtime Information'); <div class="tabInnerContent clearfloat"> </div> <div id="advisorInstructionsDialog" style="display:none;"> - <?php echo __('The Advisor system can provide recommendations on server variables by analyzing the server status variables. <p>Do note however that this system provides recommendations based on simple calculations and by rule of thumb which may not necessarily apply to your system.</p> <p>Prior to changing any of the configuration, be sure to know what you are changing (by reading the documentation) and how to undo the change. Wrong tuning can have a very negative effect on performance.</p> <p>The best way to tune your system would be to change only one setting at a time, observe or benchmark your database, and undo the change if there was no clearly measurable improvement.</p>'); ?> + <?php + echo '<p>'; + echo __('The Advisor system can provide recommendations on server variables by analyzing the server status variables.'); + echo '</p> <p>'; + echo __('Do note however that this system provides recommendations based on simple calculations and by rule of thumb which may not necessarily apply to your system.'); + echo '</p> <p>'; + echo __('Prior to changing any of the configuration, be sure to know what you are changing (by reading the documentation) and how to undo the change. Wrong tuning can have a very negative effect on performance.'); + echo '</p> <p>'; + echo __('The best way to tune your system would be to change only one setting at a time, observe or benchmark your database, and undo the change if there was no clearly measurable improvement.'); + echo '</p>'; + ?> </div> </div> </div> @@ -1448,9 +1458,9 @@ function printMonitor() <a href="#rearrangeCharts"><img class="icon ic_b_tblops" src="themes/dot.gif" width="16" height="16" alt=""> <?php echo __('Rearrange/edit charts'); ?></a> <div class="clearfloat paddingtop"></div> <div class="floatleft"> - <?php - echo __('Refresh rate') . '<br />'; - refreshList('gridChartRefresh', 5, Array(2, 3, 4, 5, 10, 20, 40, 60, 120, 300, 600, 1200)); + <?php + echo __('Refresh rate') . '<br />'; + refreshList('gridChartRefresh', 5, Array(2, 3, 4, 5, 10, 20, 40, 60, 120, 300, 600, 1200)); ?><br> </div> <div class="floatleft"> @@ -1493,12 +1503,22 @@ function printMonitor() <div class="monitorUse" style="display:none;"> <p></p> <?php - echo __('<b>Using the monitor:</b><br/> Ok, you are good to go! Once you click \'Start monitor\' your browser will refresh all displayed charts in a regular interval. You may add charts and change the refresh rate under \'Settings\', or remove any chart using the cog icon on each respective chart. <p>To display queries from the logs, select the relevant time span on any chart by holding down the left mouse button and panning over the chart. Once confirmed, this will load a table of grouped queries, there you may click on any occuring SELECT statements to further analyze them.</p>'); + echo '<strong>'; + echo __('Using the monitor:'); + echo '</strong><p>'; + echo __('Ok, you are good to go! Once you click \'Start monitor\' your browser will refresh all displayed charts in a regular interval. You may add charts and change the refresh rate under \'Settings\', or remove any chart using the cog icon on each respective chart.'); + echo '</p><p>'; + echo __('To display queries from the logs, select the relevant time span on any chart by holding down the left mouse button and panning over the chart. Once confirmed, this will load a table of grouped queries, there you may click on any occuring SELECT statements to further analyze them.'); + echo '</p>'; ?> <p> <img class="icon ic_s_attention" src="themes/dot.gif" alt=""> <?php - echo __('<b>Please note:</b> Enabling the general_log may increase the server load by 5-15%. Also be aware that generating statistics from the logs is a load intensive task, so it is advisable to select only a small time span and to disable the general_log and empty its table once monitoring is not required any more.'); + echo '<strong>'; + echo __('Please note:'); + echo '</strong><p>'; + echo __('Enabling the general_log may increase the server load by 5-15%. Also be aware that generating statistics from the logs is a load intensive task, so it is advisable to select only a small time span and to disable the general_log and empty its table once monitoring is not required any more.'); + echo '</p>'; ?> </p> </div> @@ -1508,7 +1528,7 @@ function printMonitor() <div id="addChartDialog" title="Add chart" style="display:none;"> <div id="tabGridVariables"> <p><input type="text" name="chartTitle" value="<?php echo __('Chart Title'); ?>" /></p> - + <input type="radio" name="chartType" value="preset" id="chartPreset"> <label for="chartPreset"><?php echo __('Preset chart'); ?></label> <select name="presetCharts"></select><br/> @@ -1583,7 +1603,13 @@ function printMonitor() <?php echo __('Remove variable data in INSERT statements for better grouping'); ?> </label>
- <?php echo __('<p>Choose from which log you want the statistics to be generated from.</p> Results are grouped by query text.'); ?> + <?php + echo '<p>'; + echo __('Choose from which log you want the statistics to be generated from.'); + echo '</p><p>'; + echo __('Results are grouped by query text.'); + echo '</p>'; + ?> </div>
<div id="queryAnalyzerDialog" title="<?php echo __('Query analyzer'); ?>" style="display:none;"> @@ -1656,4 +1682,4 @@ function cleanDeprecated(&$server_status) * Sends the footer */ require './libraries/footer.inc.php'; -?> \ No newline at end of file +?>
hooks/post-receive