Skip to content

fix: Rewind iterator before calling current/next #2218

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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
CarlSchwan wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: Rewind iterator before calling current/next #2218

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions lib/Controller/LogController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ public function get($query = '', $count = 50, $offset = 0): JSONResponse {
*/
private function getLastItem() {
$iterator = $this->logIteratorFactory->getLogIterator($this->settingsService->getShownLevels());

@Antreesy Antreesy Sep 1, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This already does rewind on creating from class, and calling next() once - so it should be on the latest line already:

$this->logIteratorFactory->getLogIterator($this->settingsService->getShownLevels());
	...
	new LogIterator($handle, $dateFormat, $timezone);
		...
		__construct($handle, string $dateFormat, string $timezone) {
			...
			$this->rewind();
				...
				$this->next();

What does it fix? I remember investigating something with it, but didn't finish. But not sure that current code brings something to it

@CarlSchwan CarlSchwan Sep 1, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Before the fix I always got null has return from getLastItem

@come-nc come-nc Sep 1, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is something weird going on because I agree with @Antreesy the code is supposed to return a rewinded iterator already from the factory

$iterator->rewind();
return $iterator->current();
}

Expand Down Expand Up @@ -102,6 +103,7 @@ public function poll(string $lastReqId): JSONResponse {
}

$iterator = $this->logIteratorFactory->getLogIterator($this->settingsService->getShownLevels());
$iterator->rewind();
$iterator->next();

$data = [];
Expand Down
Loading