Skip to content

[stable29] fix: LogIterator duplicates and drops log entries #1237

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
icewind1991 merged 3 commits into from
Apr 30, 2024
Merged

[stable29] fix: LogIterator duplicates and drops log entries #1237

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6fb4f77
fix: LogIterator duplicates and drops log entries
jmechnich Apr 28, 2024
dd90444
add test for trailing newlines in log iterator
icewind1991 Apr 29, 2024
b32d677
fix log iterator rewind not resetting state
icewind1991 Apr 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
fix log iterator rewind not resetting state 
Signed-off-by: Robin Appelman <[email protected]>
  • Loading branch information
@icewind1991 @backportbot
icewind1991 authored and backportbot[bot] committed Apr 30, 2024
commit b32d677c40d80876d949a1a81d3d8b17abf7b556
6 changes: 5 additions & 1 deletion lib/Log/LogIterator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,16 @@ public function __construct($handle, string $dateFormat, string $timezone) {
$this->handle = $handle;
$this->dateFormat = $dateFormat;
$this->timezone = new \DateTimeZone($timezone);
$this->rewind();
}

public function rewind(): void {
fseek($this->handle, 0, SEEK_END);
$this->position = ftell($this->handle);
$this->currentKey = 0;
$this->lastLine = '';
$this->buffer = '';
$this->currentKey = -1;
$this->next();
}

/**
Expand Down