webcraftmedia/system
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

saimodlog fixes

Browse Source
This commit is contained in:
Ulf Gebhardt 2013-12-21 18:44:38 +01:00
parent fdf1ad9740
commit 0cf635762c
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sai/modules/saimod_sys_log/saimod_sys_log.js
View File

@ -16,10 +16,7 @@ function init__SYSTEM_SAI_saimod_sys_log() {
$('#refresh_error_table').live("click", (function(){
$('img#loader').show();
$('#content-wrapper').load(SAI_ENDPOINT+'sai_mod=.SYSTEM.SAI.saimod_sys_log',function(){$('img#loader').hide();});
drawVisualization();
}));
do_filter("");}));
$("#filter-error button").live("click", (function(){
$('#filter-error button').each(function(){
@ -54,6 +51,7 @@ function drawVisualization() {
var data2 = new google.visualization.DataTable();
data2.addColumn('date', 'day');
data2.addColumn('number', 'count');
data2.addColumn('number', 'querytime avg');
data2.addColumn('number', 'querytime max');
data2.addColumn('number', 'querytime min');
@ -87,17 +85,17 @@ function drawVisualization() {
$.each(json, function(key, value){
data1.addRow([ new Date(value.day),
parseInt(value.count),
//value.time_min + ' - ' + value.time_max,
parseInt(value.count),
parseInt(value.file_unique),
parseInt(value.ip_unique),
parseInt(value.text_unique),
parseInt(value.class_unique)]);
data2.addRow([ new Date(value.day),
parseInt(value.count),
parseFloat(value.querytime_avg),
parseFloat(value.querytime_max),
parseFloat(value.querytime_min)]);
data3.addRow([ new Date(value.day),
data3.addRow([ new Date(value.day),
parseInt(value.count),
parseInt(value.class_info)+0.5,
parseInt(value.class_deprecated)+0.5,
@ -124,15 +122,15 @@ function drawVisualization() {
// Create and draw the visualization.
var options = {title: 'Exception Occurance', aggregationTarget: 'category', selectionMode: 'multiple', /*focusTarget: 'category',*/ chartArea:{left:50,top:40}, vAxis:{logScale: true}, interpolateNulls: false, width: "1200", height: "400"};
var options = {title: 'Exception Occurrence', aggregationTarget: 'category', selectionMode: 'multiple', /*focusTarget: 'category',*/ chartArea:{left:100,top:40}, vAxis:{logScale: true}, interpolateNulls: false, width: "1400", height: "500"};
new google.visualization.LineChart(document.getElementById('visualization1')).draw(data1, options);
var options = {title: 'Exception Querytime', /*focusTarget: 'category',*/ chartArea:{left:50,top:40}, vAxis:{logScale: true}, interpolateNulls: false, width: "1200", height: "400"};
var options = {title: 'Exception Querytime', /*focusTarget: 'category',*/ chartArea:{left:100,top:40}, vAxis:{logScale: true}, interpolateNulls: false, width: "1400", height: "500"};
new google.visualization.LineChart(document.getElementById('visualization2')).draw(data2, options);
var options = {title: 'Exception Classes - basic', /*focusTarget: 'category',*/ chartArea:{left:50,top:40}, vAxis:{logScale: true}, interpolateNulls: false, width: "1200", height: "400"};
var options = {title: 'Exception Classes - basic', /*focusTarget: 'category',*/ chartArea:{left:100,top:40}, vAxis:{logScale: true}, interpolateNulls: false, width: "1400", height: "500"};
new google.visualization.LineChart(document.getElementById('visualization3')).draw(data3, options);
var options = {title: 'Exception Classes - system', /*focusTarget: 'category',*/ chartArea:{left:50,top:40}, vAxis:{logScale: true}, interpolateNulls: false, width: "1200", height: "400"};
var options = {title: 'Exception Classes - system', /*focusTarget: 'category',*/ chartArea:{left:100,top:40}, vAxis:{logScale: true}, interpolateNulls: false, width: "1400", height: "500"};
new google.visualization.LineChart(document.getElementById('visualization4')).draw(data4, options);
var options = {title: 'Exception Classes - other', /*focusTarget: 'category',*/ chartArea:{left:50,top:40}, vAxis:{logScale: true}, interpolateNulls: false, width: "1200", height: "400"};
var options = {title: 'Exception Classes - other', /*focusTarget: 'category',*/ chartArea:{left:100,top:40}, vAxis:{logScale: true}, interpolateNulls: false, width: "1400", height: "500"};
new google.visualization.LineChart(document.getElementById('visualization5')).draw(data5, options);
$('img#loader').hide();

4
sai/modules/saimod_sys_log/saimod_sys_log.php
View File

@ -79,9 +79,9 @@ class saimod_sys_log extends \SYSTEM\SAI\SaiModule {
while($r = $res->next()){
//TODO make time conversion on database
if(\SYSTEM\system::isSystemDbInfoPG()){
$result .= '<tr class="'.self::tablerow_class($r['class']).'">'.'<td>'.self::time_elapsed_string(strtotime($r['time'])).'</td>'.'<td>'.$r['time'].'</td>'.'<td>'.$r['class'].'</td>'.'<td>'.substr($r['message'],0,255).'</td>'.'<td>'.$r['code'].'</td>'.'<td>'.$r['file'].'</td>'.'<td>'.$r['line'].'</td>'.'<td>'.$r['ip'].'</td>'.'<td>'.$r['querytime'].'</td>'.'</tr>';
$result .= '<tr class="'.self::tablerow_class($r['class']).'">'.'<td>'.self::time_elapsed_string(strtotime($r['time'])).'</td>'.'<td>'.$r['time'].'</td>'.'<td>'.$r['class'].'</td>'.'<td style="word-break: break-all">'.substr($r['message'],0,255).'</td>'.'<td>'.$r['code'].'</td>'.'<td style="word-break: break-all">'.$r['file'].'</td>'.'<td>'.$r['line'].'</td>'.'<td>'.$r['ip'].'</td>'.'<td>'.$r['querytime'].'</td>'.'</tr>';
} else {
$result .= '<tr class="'.self::tablerow_class($r['class']).'">'.'<td>'.self::time_elapsed_string($r['time']).'</td>'.'<td>'.$r['time'].'</td>'.'<td>'.$r['class'].'</td>'.'<td>'.substr($r['message'],0,255).'</td>'.'<td>'.$r['code'].'</td>'.'<td>'.$r['file'].'</td>'.'<td>'.$r['line'].'</td>'.'<td>'.$r['ip'].'</td>'.'<td>'.$r['querytime'].'</td>'.'</tr>';
$result .= '<tr class="'.self::tablerow_class($r['class']).'">'.'<td>'.self::time_elapsed_string($r['time']).'</td>'.'<td>'.$r['time'].'</td>'.'<td>'.$r['class'].'</td>'.'<td style="word-break: break-all;">'.substr($r['message'],0,255).'</td>'.'<td>'.$r['code'].'</td>'.'<td>'.$r['file'].'</td>'.'<td>'.$r['line'].'</td>'.'<td>'.$r['ip'].'</td>'.'<td>'.$r['querytime'].'</td>'.'</tr>';
}
}
$result .= '</table>';