Skip to content
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.

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

fix: LogIterator duplicates and drops log entries #1235

Merged
merged 3 commits into from
Apr 30, 2024

Conversation

jmechnich
Copy link
Contributor

Fixes #1236.

@jmechnich
Copy link
Contributor Author

This conditional here

if ($newlinePos+1 === strlen($this->buffer)) {
// try again with truncated buffer if it ends with newline, i.e. on first call
$this->buffer = substr($this->buffer, 0, $newlinePos);
continue;
}

could possibly be replaced by just seeking one byte before EOF to cut off the final newline:
In LogIterator::rewind(): fseek($this->handle, -1, SEEK_END);

Not sure how reliable this assumption is though.

Signed-off-by: Jörg Mechnich <joerg.mechnich@gmail.com>
Signed-off-by: Robin Appelman <robin@icewind.nl>
Signed-off-by: Robin Appelman <robin@icewind.nl>
@icewind1991
Copy link
Member

Added some changes to make the tests pass, please verify that things are still working as expected for you.

could possibly be replaced by just seeking one byte before EOF to cut off the final newline:
In LogIterator::rewind(): fseek($this->handle, -1, SEEK_END);

I think the current approach is more reliable

@jmechnich
Copy link
Contributor Author

Added some changes to make the tests pass, please verify that things are still working as expected for you.

Looks good, thanks! 👍

@icewind1991 icewind1991 merged commit 6d82c43 into nextcloud:master Apr 30, 2024
25 checks passed
@icewind1991
Copy link
Member

/backport to stable29

Copy link

Hello there,
Thank you so much for taking the time and effort to create a pull request to our Nextcloud project.

We hope that the review process is going smooth and is helpful for you. We want to ensure your pull request is reviewed to your satisfaction. If you have a moment, our community management team would very much appreciate your feedback on your experience with this PR review process.

Your feedback is valuable to us as we continuously strive to improve our community developer experience. Please take a moment to complete our short survey by clicking on the following link: https://cloud.nextcloud.com/apps/forms/s/i9Ago4EQRZ7TWxjfmeEpPkf6

Thank you for contributing to Nextcloud and we hope to hear from you soon!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Bug]: Duplicate log messages in frontend and from occ log in NC29
2 participants