logger: fix file open issue if crypto algorithm is disabled #24156
+19
−26
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
move init_logfile_encryption() call after the buffer start_log() call to have log file already open while storing the header and key data to the beginning of the file.
jnippula
force-pushed
the
fix-logger-no-crypto
branch
from
38a0fe3 to
dfd8f2c
Compare
bkueng
reviewed
Jan 6, 2025
| PX4_ERR("Failed to start encrypted logging"); | ||
| _crypto.close(); | ||
| _buffers[(int)type]._should_run = false; | ||
| _buffers[(int)type].close_file(); |
There was a problem hiding this comment.
Suggested change
| _buffers[(int)type].close_file(); | |
| _buffers[(int)type].close_file(); | |
| _buffers[(int)type].reset(); |
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.
Open log file only once to avoid conflicts.
Solved Problem
Fixes #24155
Solution
Changelog Entry
For release notes:
Alternatives
Could also add "append" parameter to start_log() function to select whether file needs to be opened as APPEND or CREATE flag. Another option is to store the keydata into temporary memory buffer and store it to file when opened in buffer's start_log() method.
Test coverage