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

journal: modernize journal ratelimiting #32758

Merged
merged 9 commits into from
May 13, 2024
Merged

Conversation

yuwata
Copy link
Member

@yuwata yuwata commented May 11, 2024

No description provided.

Copy link

Important

An -rc1 tag has been created and a release is being prepared, so please note that PRs introducing new features and APIs will be held back until the new version has been released.

@yuwata yuwata marked this pull request as ready for review May 11, 2024 12:29
@yuwata yuwata added the please-review PR is ready for (re-)review by a maintainer label May 11, 2024
g->parent->n_groups--;
}
if (g->groups_by_id && g->id)
ordered_hashmap_remove(g->groups_by_id, g->id);
Copy link
Member

Choose a reason for hiding this comment

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

Maybe, assert_se(ordered_hashmap_remove_value(...))?

Copy link
Member Author

Choose a reason for hiding this comment

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

assert_se() does not work here, as the entry is already removed if this is called from the destructor of the hashmap.

src/journal/journald-rate-limit.c Outdated Show resolved Hide resolved
@yuwata
Copy link
Member Author

yuwata commented May 13, 2024

@YHNdnzj Thank you for the review. Applied the above suggestions. Upgrading the green label.

@yuwata yuwata added the good-to-merge/waiting-for-ci 👍 PR is good to merge, but CI hasn't passed at time of review. Please merge if you see CI has passed label May 13, 2024
…oup with OrderedHashmap

No functional change, just refactoring.
@bluca bluca merged commit 74cf904 into systemd:main May 13, 2024
42 of 48 checks passed
@github-actions github-actions bot removed the good-to-merge/waiting-for-ci 👍 PR is good to merge, but CI hasn't passed at time of review. Please merge if you see CI has passed label May 13, 2024
@yuwata yuwata deleted the journal-ratelimit branch May 13, 2024 13:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Development

Successfully merging this pull request may close these issues.

None yet

3 participants