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

fixed some bugs in reading backwards (logstreamdisk)

Browse Source
This commit is contained in:
Michael Meckelein 2008-03-14 11:03:03 +01:00
parent d8c6bbf261
commit bd205e78f1
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
classes/logstreamdisk.class.php
View File

@ -39,7 +39,7 @@ class LogStreamDisk extends LogStream {
const _BUFFER_length = 8192;
private $_buffer = false;
private $_buffer_length = -1;
private $_buffer_length = 0;
private $_p_buffer = -1;
// Constructor
@ -84,14 +84,15 @@ class LogStreamDisk extends LogStream {
$this->_bEOS = false;
if ($this->_readDirection == EnumReadDirection::Backward) {
// in this case we have to adjust a few settings
$this->_p_buffer = self::_BUFFER_length - 1; // set the point to the right index
// first of all, check if this is the first read
if ($this->_buffer == false) {
// this means that we have to read from the end
fseek($this->_fp, 0, SEEK_END);
$this->_currentOffset = ftell($this->_fp);
}
$this->_p_buffer = self::_BUFFER_length - 1;
$this->_p_buffer -= 1; // eat EOF
}
$orig_offset = ftell($this->_fp) - $this->_buffer_length;
@ -104,7 +105,7 @@ class LogStreamDisk extends LogStream {
$orig_offset -= self::_BUFFER_length;
if ($orig_offset <= 0) {
// ok, we have to adjust the buffer pointer
$this->_p_buffer += $orig_offset; // not orig_offset is negative
$this->_p_buffer += $orig_offset; // note orig_offset is negative, see if
$orig_offset = 0;
}
fseek($this->_fp, $orig_offset);
@ -234,27 +235,29 @@ class LogStreamDisk extends LogStream {
return ERROR_EOS;
}
if (($this->_p_buffer <= 0) && ($this->ReadNextBlock() != SUCCESS)) {
return ERROR_UNDEFINED;
if ($this->_p_buffer < 0) {
if ($this->ReadNextBlock() != SUCCESS) {
return ERROR_UNDEFINED;
}
}
$line = '';
do {
$pos = -1;
$neg_offset = ($this->_buffer_length - $this->_p_buffer) * -1;
if (($pos = strrpos($this->_buffer, "\n", $neg_offset)) !== false) {
// note that we are at the position of linefeed, so go one char forward:
filesize($this->_logStreamConfigObj->FileName);
$uID = $this->_currentOffset -= $this->_p_buffer - $pos - 1;
$arrProperitesOut[SYSLOG_MESSAGE] = $line . substr($this->_buffer, $pos + 1, $this->_p_buffer - $pos);
$uID = $this->_currentOffset -= $this->_p_buffer - $pos + 1;
$arrProperitesOut[SYSLOG_MESSAGE] = substr($this->_buffer, $pos + 1, $this->_p_buffer - $pos) . $line;
$this->_p_buffer = $pos - 1;
return SUCCESS;
}
$line .= substr($this->_buffer, 0, $this->_p_buffer);
$this->_currentOffset -= $this->_p_buffer;
$line = substr($this->_buffer, 0, $this->_p_buffer) . $line;
$this->_currentOffset -= $this->_p_buffer + 1; // as above, eat the linefeed
} while ($this->ReadNextBlock() == SUCCESS);
if ($line != '') {
@ -390,7 +393,7 @@ class LogStreamDisk extends LogStream {
private function ResetBuffer() {
$this->_buffer = false;
$this->_buffer_length = -1;
$this->_buffer_length = 0;
$this->_p_buffer = -1;
}
}