Improved single file monitoring. #83
Closed
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
dsoprea
requested changes
Aug 25, 2020
inotify/adapters.py
Outdated
| @@ -231,6 +231,10 @@ def event_gen( | |||
| in self._handle_inotify_event(fd): | |||
| last_hit_s = time.time() | |||
|
|
|||
| if handle_in_ignored and\ | |||
There was a problem hiding this comment.
Just make it default behavior. The user shouldn't have a choice. Reword the commit message to mention that we're specifically handling the IN_IGNORED event, now.
inotify/adapters.py
Outdated
| @@ -115,7 +115,7 @@ def remove_watch(self, path, superficial=False): | |||
|
|
|||
| del self.__watches[path] | |||
|
|
|||
| self.remove_watch_with_id(wd) | |||
| self.remove_watch_with_id(wd, superficial) | |||
There was a problem hiding this comment.
Put this in a separate commit since it's not related to this commit.
This reverts commit 41c19e0.
|
Hi, I reverted the original commit and did what you asked, but beware, this changes the default behavior of |
… they are removed by the kernel
ghost
closed this by deleting the head repository
This pull request was closed.
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.
Hi,
I found that the
Inotifyclass is not doing a great job in single file monitoring.According to
man inotify:The event
IN_IGNOREDis generated when a watch has been automatically removed, this happens when the monitored file is removed, and it also happens when user modify the monitored file with text editors that will replace the original file while saving (such asvim).But the
Inotifyclass itself doesn't handle this event, so the consequence is: when this happens, the watch has been automatically removed by the kernel but it still exists in theInotifyclass (inInotify.__watchesandInotify.__watches_r), and this causes a bug, when a monitored file is removed/replaced, users can no long re-add it back into the monitoring, if they try to remove it first by callingInotify.remove_watch()then the system callinotify_rm_watch()will return an error because the watch does not exist in the kernel space.So, the thing I've done is giving users an optional argument to make the
Inotifyclass handle theIN_IGNOREDevent and it's disabled by default.And I changed the usage of
superficialparameter inInotify.remove_watchas well which was not being used.