paradizelost/paperless-ngx
1
0
Fork 0
mirror of https://github.com/paperless-ngx/paperless-ngx.git synced 2025-04-02 13:45:10 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix: inotify read timeout not in ms (#5876)

Browse Source 
* Fix inotify read timeout

This was off by a factor of 1000, leading to a lot more invocations
of the loop body than necessary.

* Incorporate review feedback
This commit is contained in:
grembo 2024-02-26 01:46:47 +01:00 committed by GitHub
parent 7f8f7fbb15
commit 76064178f5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/documents/management/commands/document_consumer.py
View File

@ -286,10 +286,10 @@ class Command(BaseCommand):
def handle_inotify(self, directory, recursive, is_testing: bool): def handle_inotify(self, directory, recursive, is_testing: bool):
logger.info(f"Using inotify to watch directory for changes: {directory}") logger.info(f"Using inotify to watch directory for changes: {directory}")
timeout = None timeout_ms = None
if is_testing: if is_testing:
timeout = self.testing_timeout_ms timeout_ms = self.testing_timeout_ms
logger.debug(f"Configuring timeout to {timeout}ms") logger.debug(f"Configuring timeout to {timeout_ms}ms")
inotify = INotify() inotify = INotify()
inotify_flags = flags.CLOSE_WRITE | flags.MOVED_TO | flags.MODIFY inotify_flags = flags.CLOSE_WRITE | flags.MOVED_TO | flags.MODIFY
@ -298,7 +298,8 @@ class Command(BaseCommand):
else: else:
descriptor = inotify.add_watch(directory, inotify_flags) descriptor = inotify.add_watch(directory, inotify_flags)
inotify_debounce: Final[float] = settings.CONSUMER_INOTIFY_DELAY inotify_debounce_secs: Final[float] = settings.CONSUMER_INOTIFY_DELAY
inotify_debounce_ms: Final[int] = inotify_debounce_secs * 1000
finished = False finished = False
@ -306,7 +307,7 @@ class Command(BaseCommand):
while not finished: while not finished:
try: try:
for event in inotify.read(timeout=timeout): for event in inotify.read(timeout=timeout_ms):
path = inotify.get_path(event.wd) if recursive else directory path = inotify.get_path(event.wd) if recursive else directory
filepath = os.path.join(path, event.name) filepath = os.path.join(path, event.name)
if flags.MODIFY in flags.from_mask(event.mask): if flags.MODIFY in flags.from_mask(event.mask):
@ -323,7 +324,7 @@ class Command(BaseCommand):
# Current time - last time over the configured timeout # Current time - last time over the configured timeout
waited_long_enough = ( waited_long_enough = (
monotonic() - last_event_time monotonic() - last_event_time
) > inotify_debounce ) > inotify_debounce_secs
# Also make sure the file exists still, some scanners might write a # Also make sure the file exists still, some scanners might write a
# temporary file first # temporary file first
@ -342,11 +343,11 @@ class Command(BaseCommand):
# If files are waiting, need to exit read() to check them # If files are waiting, need to exit read() to check them
# Otherwise, go back to infinite sleep time, but only if not testing # Otherwise, go back to infinite sleep time, but only if not testing
if len(notified_files) > 0: if len(notified_files) > 0:
timeout = inotify_debounce timeout_ms = inotify_debounce_ms
elif is_testing: elif is_testing:
timeout = self.testing_timeout_ms timeout_ms = self.testing_timeout_ms
else: else:
timeout = None timeout_ms = None
if self.stop_flag.is_set(): if self.stop_flag.is_set():
logger.debug("Finishing because event is set") logger.debug("Finishing because event is set")