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

Added support to display warning messages in the index page, and also added more information links

Browse Source
This commit is contained in:
Andre Lorbach 2008-09-18 16:14:32 +02:00
parent 36f6d93074
commit 74cd4a5be7
6 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -259,7 +259,9 @@ class LogStreamDisk extends LogStream {
// This may display a warning message, so the user knows we stopped reading records because of the script timeout.
$content['logstream_warning'] = "false";
$content['logstream_warning_details'] = $content['LN_WARNING_LOGSTREAMDISK_TIMEOUT'];
$content['logstream_warning_code'] = ERROR_FILE_NOMORETIME;
// Return error code
return ERROR_FILE_NOMORETIME;
}

1
src/include/constants_errors.php
View File

@ -51,6 +51,7 @@ define('ERROR_UNDEFINED', 6);
define('ERROR_EOS', 7);
define('ERROR_NOMORERECORDS', 8);
define('ERROR_FILTER_NOT_MATCH', 9);
define('ERROR_SOURCENOTFOUND', 24);
define('ERROR_DB_CONNECTFAILED', 10);
define('ERROR_DB_CANNOTSELECTDB', 11);

4
src/include/functions_common.php
View File

@ -1341,6 +1341,10 @@ function GetErrorMessage($errorCode)
case ERROR_CHARTS_NOTCONFIGURED:
return $content['LN_ERROR_CHARTS_NOTCONFIGURED'];
case ERROR_FILE_NOMORETIME:
return $content['LN_ERROR_FILE_NOMORETIME'];
case ERROR_SOURCENOTFOUND:
return $content['LN_GEN_ERROR_SOURCENOTFOUND'];
default:
return GetAndReplaceLangStr( $content['LN_ERROR_UNKNOWN'], $errorCode );

3
src/index.php
View File

@ -268,6 +268,7 @@ if ( isset($content['Sources'][$currentSourceID]) )
// This will disable to Main SyslogView and show an error message
$content['syslogmessagesenabled'] = "false";
$content['detailederror'] = $content['LN_ERROR_NORECORDS'];
$content['detailederror_code'] = ERROR_NOMORERECORDS;
}
// ---
@ -934,6 +935,7 @@ if ( isset($content['Sources'][$currentSourceID]) )
// This will disable to Main SyslogView and show an error message
$content['syslogmessagesenabled'] = "false";
$content['detailederror'] = GetErrorMessage($res);
$content['detailederror_code'] = $res;
if ( isset($extraErrorDescription) )
$content['detailederror'] .= "<br><br>" . GetAndReplaceLangStr( $content['LN_SOURCES_ERROR_EXTRAMSG'], $extraErrorDescription);
@ -946,6 +948,7 @@ else
{
$content['syslogmessagesenabled'] = "false";
$content['detailederror'] = GetAndReplaceLangStr( $content['LN_GEN_ERROR_SOURCENOTFOUND'], $currentSourceID);
$content['detailederror_code'] = ERROR_SOURCENOTFOUND;
}
// ---

1
src/lang/en/main.php
View File

@ -96,6 +96,7 @@ $content['LN_ERROR_DB_DBFIELDNOTFOUND'] = "Database Field mapping for at least o
$content['LN_FOOTER_SECONDS'] = "seconds";
$content['LN_WARNING_LOGSTREAMTITLE'] = "Logstream Warning";
$content['LN_WARNING_LOGSTREAMDISK_TIMEOUT'] = "While reading the logstream, the php script timeout forced me to abort at this point.<br><br> If you want to avoid this, please increase the phpLogCon script timeout in your config.php. If the user system is installed, you can do that in Admin center.";
$content['LN_ERROR_FILE_NOMORETIME'] = "No more time for processing left";
// Topmenu Entries
$content['LN_MENU_SEARCH'] = "Search";

14
src/templates/index.html
View File

@ -369,7 +369,13 @@
<center>
<div class="table_with_border_second ErrorMsg" style="width:600px">
<div class="PriorityError">{LN_ERROR_NORECORDS} - {LN_GEN_ERRORDETAILS}</div>
<p>{detailederror}</p>
<p align="left">{detailederror}</p>
<p>
<a href="http://kb.monitorware.com/kbeventdb-list-12-Adiscon-phpLogCon-{detailederror_code}.html" target="_blank">
<img src="{MENU_HELP_ORANGE}" width="16" height="16" title="{LN_GEN_MOREINFORMATION}">
{LN_GEN_MOREINFORMATION}
</a>
</p>
</div>
<br><br>
</center>
@ -382,6 +388,12 @@
<div class="table_with_border_second ErrorMsg" style="width:600px">
<div class="PriorityWarning">{LN_WARNING_LOGSTREAMTITLE}</div>
<p align="left">{logstream_warning_details}</p>
<p>
<a href="http://kb.monitorware.com/kbeventdb-list-12-Adiscon-phpLogCon-{logstream_warning_code}.html" target="_blank">
<img src="{MENU_HELP_ORANGE}" width="16" height="16" title="{LN_GEN_MOREINFORMATION}">
{LN_GEN_MOREINFORMATION}
</a>
</p>
</div>
<br><br>
</center>