Changed IUT Type to WEBSERVER Logfile in general, as IIS is supported as well now

This commit is contained in:
Andre Lorbach 2008-09-18 14:29:17 +02:00
parent 5d32582188
commit 52990a07d3
7 changed files with 13 additions and 6 deletions

View File

@ -131,6 +131,12 @@ abstract class LogStreamConfig {
public function ProcessMsgParsers($szMsg, &$arrArguments)
{
// Abort msgparsers if we have less then 5 seconds of processing time!
global $content, $gl_starttime;
$scriptruntime = intval(microtime_float() - $gl_starttime);
if ( $scriptruntime > ($content['MaxExecutionTime']-5) )
return ERROR_MSG_SCANABORTED;
// Process if set!
if ( $this->_msgParserObjList != null )
{

View File

@ -136,7 +136,7 @@ class MsgParser_apache2 extends MsgParser {
}
// Set IUT Property if success!
$arrArguments[SYSLOG_MESSAGETYPE] = IUT_APACHELOG;
$arrArguments[SYSLOG_MESSAGETYPE] = IUT_WEBSERVERLOG;
// If we reached this position, return success!
return SUCCESS;

View File

@ -145,7 +145,7 @@ class MsgParser_iis extends MsgParser {
}
// Set IUT Property if success!
$arrArguments[SYSLOG_MESSAGETYPE] = IUT_APACHELOG;
$arrArguments[SYSLOG_MESSAGETYPE] = IUT_WEBSERVERLOG;
// If we reached this position, return success!
return SUCCESS;

View File

@ -63,5 +63,6 @@ define('ERROR_DB_DBFIELDNOTFOUND', 19);
define('ERROR_MSG_NOMATCH', 18);
define('ERROR_CHARTS_NOTCONFIGURED', 20);
define('ERROR_MSG_SKIPMESSAGE', 21);
define('ERROR_MSG_SCANABORTED', 22);
?>

View File

@ -111,6 +111,6 @@ $content['filter_severity_list'][] = array( "ID" => SYSLOG_DEBUG, "DisplayName"
$content['filter_messagetype_list'][] = array( "ID" => IUT_Syslog, "DisplayName" => "Syslog", "selected" => "" );
$content['filter_messagetype_list'][] = array( "ID" => IUT_NT_EventReport, "DisplayName" => "WinEventLog", "selected" => "" );
$content['filter_messagetype_list'][] = array( "ID" => IUT_File_Monitor, "DisplayName" => "File Monitor", "selected" => "" );
$content['filter_messagetype_list'][] = array( "ID" => IUT_APACHELOG, "DisplayName" => "Apache Webserver Logfile", "selected" => "" );
$content['filter_messagetype_list'][] = array( "ID" => IUT_WEBSERVERLOG, "DisplayName" => "Webserver Logfile", "selected" => "" );
?>

View File

@ -178,7 +178,7 @@ define('IUT_IMAPProbe', '21');
define('IUT_NNTPProbe', '22');
define('IUT_WEVTMONV2', '23');
define('IUT_SMTPLISTENER', '24');
define('IUT_APACHELOG', '10001');
define('IUT_WEBSERVERLOG', '10001');
$msgtype_colors[IUT_Unknown] = "#D0FBDC";
$msgtype_colors[IUT_Syslog] = "#D0FBF1";
$msgtype_colors[IUT_Heartbeat] = "#D0EEFB";
@ -201,7 +201,7 @@ $msgtype_colors[IUT_IMAPProbe] = "#D0FBE8";
$msgtype_colors[IUT_NNTPProbe] = "#D0F7FB";
$msgtype_colors[IUT_WEVTMONV2] = "#CCE4D2";
$msgtype_colors[IUT_SMTPLISTENER] = "#CCE4DE";
$msgtype_colors[IUT_APACHELOG] = "#E1FBD0";
$msgtype_colors[IUT_WEBSERVERLOG] = "#E1FBD0";
// ---
?>

View File

@ -1113,7 +1113,7 @@ function ReverseResolveIP( $szIP, $prepend, $append )
{
global $gl_starttime, $content;
// Substract 5 savety seconds!
// Substract 5 seconds we need to finish processing!
$scriptruntime = intval(microtime_float() - $gl_starttime);
if ( $scriptruntime > ($content['MaxExecutionTime']-5) )
return "";