A few small fixes in cysystemd.reader #61
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The boot_id method was just returning itself: a reference to a method. This fixes that, as well as converts it to a property.
In particular, we want to be able to pass `flags=0` to implement the functionality of the journalctl's `--merge` option. But the open flags are [clearly meant] to be bitwise or-ed with each other. [clearly meant]: https://github.com/systemd/systemd/blob/cc9f4cad8cd759ab55048dc7a3eaa2c2fb0344da/src/systemd/sd-journal.h#L66C1-L77C3
|
@mosquito Thank you! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR includes three minor fixes to
cysstemd.reader. (Let me know if you'd like me to split it into separate PRs.)Fix JournalEntry.date
Sets the
.tzinfoattribute of thedatetimereturned by theJournalEntry.dateattribute. This fixes #60.Fix JournalEntry.boot_id
Fixes the
JournalEntry.boot_idmethod (and converts it to a property). It was totally broken — it just returned itself (a method instance).Fix JournalOpenMode
Fixes
JournalOpenModemaking it anIntFlagrather than anIntEnum. It should be a flag — that is, it members can be bit-ORed with each other. TheIntEnumdoes not allow that. In particular, I would like to be able to passflags=0toJournalReader.openin order to be able to implement the same functionality as passing the--mergeoption tojournalctl