mirror of
https://github.com/rsyslog/loganalyzer.git
synced 2025-09-25 18:59:12 +02:00
Merge branch 'v3-stable' into beta
This commit is contained in:
commit
8ca3e0db1e
@ -858,30 +858,6 @@ abstract class LogStream {
|
|||||||
}
|
}
|
||||||
// ---
|
// ---
|
||||||
break;
|
break;
|
||||||
case "processid":
|
|
||||||
$tmpKeyName = SYSLOG_PROCESSID;
|
|
||||||
$tmpFilterType = FILTER_TYPE_NUMBER;
|
|
||||||
// --- Extra numeric Check
|
|
||||||
if ( isset($tmpValues) )
|
|
||||||
{
|
|
||||||
foreach( $tmpValues as $mykey => $szValue )
|
|
||||||
{
|
|
||||||
if ( is_numeric($szValue[FILTER_TMP_VALUE]) )
|
|
||||||
$tmpValues[$mykey][FILTER_TMP_VALUE] = $szValue[FILTER_TMP_VALUE];
|
|
||||||
else
|
|
||||||
$tmpValues[$mykey][FILTER_TMP_VALUE] = "";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
// First set Filter Mode
|
|
||||||
$tmpArray[FILTER_TMP_MODE] = $this->SetFilterIncludeMode($tmpArray[FILTER_TMP_VALUE], $tmpFilterType);
|
|
||||||
|
|
||||||
if ( !is_numeric($tmpArray[FILTER_TMP_VALUE]) )
|
|
||||||
$tmpArray[FILTER_TMP_VALUE] = "";
|
|
||||||
}
|
|
||||||
// ---
|
|
||||||
break;
|
|
||||||
/* BEGIN Eventlog based fields */
|
/* BEGIN Eventlog based fields */
|
||||||
case "eventid":
|
case "eventid":
|
||||||
$tmpKeyName = SYSLOG_EVENT_ID;
|
$tmpKeyName = SYSLOG_EVENT_ID;
|
||||||
@ -968,6 +944,10 @@ abstract class LogStream {
|
|||||||
$tmpFilterType = FILTER_TYPE_DATE;
|
$tmpFilterType = FILTER_TYPE_DATE;
|
||||||
$tmpTimeMode = DATEMODE_LASTX;
|
$tmpTimeMode = DATEMODE_LASTX;
|
||||||
break;
|
break;
|
||||||
|
case "processid":
|
||||||
|
$tmpKeyName = SYSLOG_PROCESSID;
|
||||||
|
$tmpFilterType = FILTER_TYPE_STRING;
|
||||||
|
break;
|
||||||
/* BEGIN WebLog based fields */
|
/* BEGIN WebLog based fields */
|
||||||
case SYSLOG_WEBLOG_USER:
|
case SYSLOG_WEBLOG_USER:
|
||||||
$tmpKeyName = SYSLOG_WEBLOG_USER;
|
$tmpKeyName = SYSLOG_WEBLOG_USER;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user