tyler.durden/loganalyzer
1
0
Fork 0
mirror of https://github.com/rsyslog/loganalyzer.git synced 2025-09-26 03:09:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

logstreamdisk: Fixed case sensitive variables in consolidate functions

Browse Source
This commit is contained in:
Andre Lorbach 2016-10-11 14:15:53 +02:00
parent febaf409cd
commit 04d3578bee
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/classes/logstreamdisk.class.php
View File

@ -827,7 +827,7 @@ class LogStreamDisk extends LogStream {
$myFieldData = $logArray[$szConsFieldId];
if ( isset($aResult[ $myFieldData ]) )
$aResult[ $myFieldData ]['ItemCount']++;
$aResult[ $myFieldData ]['itemcount']++;
else
{
// Initialize entry if we haven't exceeded the RecordLImit yet!
@ -835,15 +835,16 @@ class LogStreamDisk extends LogStream {
{
// Init entry
$aResult[ $myFieldData ][$szSortFieldId] = $logArray[$szSortFieldId];
$aResult[ $myFieldData ]['ItemCount'] = 1;
$aResult[ $myFieldData ]['itemcount'] = 1;
}
else
{
// Count record to others
if ( isset($aResult[ $content['LN_STATS_OTHERS'] ]) )
$aResult[ $content['LN_STATS_OTHERS'] ]['ItemCount']++;
else
$aResult[ $content['LN_STATS_OTHERS'] ]['ItemCount'] = 1;
$aResult[ $content['LN_STATS_OTHERS'] ]['itemcount']++;
else {
$aResult[ $content['LN_STATS_OTHERS'] ]['itemcount'] = 1;
}
}
}
}
@ -924,8 +925,8 @@ class LogStreamDisk extends LogStream {
if ( isset($aResult[ $myFieldData ]) )
{
$aResult[ $myFieldData ]['ItemCount']++;
$aResult[ $myFieldData ]['LastOccurrence_Date'] = $logArray[SYSLOG_DATE];
$aResult[ $myFieldData ]['itemcount']++;
$aResult[ $myFieldData ]['lastoccurrence_date'] = $logArray[SYSLOG_DATE];
}
else
{
@ -946,18 +947,18 @@ class LogStreamDisk extends LogStream {
else
$aResult[ $myFieldData ][$szSortFieldId] = $logArray[$szSortFieldId];
$aResult[ $myFieldData ]['ItemCount'] = 1;
$aResult[ $myFieldData ]['itemcount'] = 1;
$aResult[ $myFieldData ]['FirstOccurrence_Date'] = $logArray[SYSLOG_DATE];
$aResult[ $myFieldData ]['LastOccurrence_Date'] = $logArray[SYSLOG_DATE];
$aResult[ $myFieldData ]['firstoccurrence_date'] = $logArray[SYSLOG_DATE];
$aResult[ $myFieldData ]['lastoccurrence_date'] = $logArray[SYSLOG_DATE];
}
else
{
// Count record to others
if ( isset($aResult[ $content['LN_STATS_OTHERS'] ]) )
$aResult[ $content['LN_STATS_OTHERS'] ]['ItemCount']++;
$aResult[ $content['LN_STATS_OTHERS'] ]['itemcount']++;
else
$aResult[ $content['LN_STATS_OTHERS'] ]['ItemCount'] = 1;
$aResult[ $content['LN_STATS_OTHERS'] ]['itemcount'] = 1;
}
}
}
@ -980,7 +981,7 @@ class LogStreamDisk extends LogStream {
// finally return result!
if ( count($aResult) > 0 )
return $aResult;
else
else
return ERROR_NOMORERECORDS;
}
else

5
src/classes/reports/report.syslog.syslogsummary.class.php
View File

@ -154,7 +154,6 @@ class Report_syslogsummary extends Report {
{
$tmpReportData['DisplayName'] = $this->GetSeverityDisplayName( $tmpReportData[SYSLOG_SEVERITY] );
$tmpReportData['bgcolor'] = $this->GetSeverityBGColor( $tmpReportData[SYSLOG_SEVERITY] ); // $severity_colors[ $tmpReportData[SYSLOG_SEVERITY] ];
$iTotalEvents += $tmpReportData['itemcount'];
}
@ -369,9 +368,9 @@ class Report_syslogsummary extends Report {
foreach ( $content["report_consdata"][ $myHost ]['cons_msgs'] as &$myConsData )
{
// Set Basic data entries
if (!isset( $content['filter_facility_list'][$myConsData[SYSLOG_FACILITY]] ))
if (!isset($myConsData[SYSLOG_FACILITY]) || !isset( $content['filter_facility_list'][$myConsData[SYSLOG_FACILITY]] ))
$myConsData[SYSLOG_FACILITY] = SYSLOG_LOCAL0; // Set default in this case
if (!isset( $content['filter_severity_list'][$myConsData[SYSLOG_SEVERITY]] ))
if (!isset($myConsData[SYSLOG_SEVERITY]) || !isset( $content['filter_severity_list'][$myConsData[SYSLOG_SEVERITY]] ))
$myConsData[SYSLOG_SEVERITY] = SYSLOG_NOTICE; // Set default in this case
}
}