Log intended folders instead of empty strings #1069
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
eloquence
requested review from
sssoleileraaa,
kushaldas and
redshiftzero
as code owners
eloquence
commented
Apr 24, 2020
| @@ -375,5 +375,5 @@ def call_decrypt(self, filepath: str, session: Session = None) -> str: | |||
| filepath, plaintext_filepath, is_doc=True | |||
| ) | |||
| logger.info("Decrypted file '{}' to folder '{}'".format( | |||
| filepath, os.path.dirname(original_filename))) | |||
| os.path.basename(filepath), os.path.dirname(filepath))) | |||
There was a problem hiding this comment.
Note that this use of os.path.basename fixes another bug; the folder would otherwise be logged twice.
redshiftzero
approved these changes
Apr 24, 2020
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.
Description
Fixes #1060. The changes in #965 switched to the wrong variable to get the folder name, so that we ended up logging empty strings instead of the intended (journalist designation) folders.
Test Plan
moscow.avishould not appear in the logs under that name after the file is downloaded in the client)Checklist