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.

Sign up for GitHub

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

Jump to bottom

JournalLock: Check for journal_dir of None #913

Merged
merged 2 commits into from
Mar 15, 2021
Merged

JournalLock: Check for journal_dir of None #913

merged 2 commits into from
Mar 15, 2021

Conversation

Athanasius
Copy link
Contributor

  • If it's None then set journal_dir_path to None as well. Setting '' or nothing results in '.' (CWD), which could cause other issues.
  • As we do this in three places, it's in a helper function.
  • New JournalLockResult.JOURNALDIR_IS_NONE to signal this.
  • Fix checking of return from obtain_lock() to specifically reference JournalLockResult.ALREADY_LOCKED.

Closes #910

@Athanasius
JournalLock: Catch when journal_dir is None
fa49159 
* If it's None then set journal_dir_path to None as well.  Setting '' or
  nothing results in '.' (CWD), which could cause other issues.
* As we do this in three places, it's in a helper function.
* New JournalLockResult.JOURNALDIR_IS_NONE to signal this.
* Fix checking of return from obtain_lock() to specifically reference
  JournalLockResult.ALREADY_LOCKED.
@Athanasius Athanasius merged commit fbcdf05 into release-4.2.1 Mar 15, 2021
@Athanasius Athanasius deleted the fix/910/journallock-when-dir-none branch March 15, 2021 16:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@A-UNDERSCORE-D A-UNDERSCORE-D A-UNDERSCORE-D approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Athanasius @A-UNDERSCORE-D