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

increased default delay when waiting for file changes with polling

Browse Source
This commit is contained in:
jonaswinkler 2021-02-21 12:14:54 +01:00
parent afc3e41f13
commit 0453787d38
4 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
docs/changelog.rst
View File

@ -21,15 +21,12 @@ paperless-ng 1.2.0
* Improved responsiveness when switching between saved views and the document list. * Improved responsiveness when switching between saved views and the document list.
* Increased the default wait time when observing files in the consumption folder
with polling from 1 to 5 seconds. This will decrease the likelihood of paperless
consuming partially written files.
* Paperless no longer depends on ``libpoppler-cpp-dev``. * Paperless no longer depends on ``libpoppler-cpp-dev``.
paperless-ng 1.1.4
##################
* Added English (GB) locale.
* Added ISO-8601 date display option.
.. note:: .. note::
Some packages that paperless depends on are slowly dropping Python 3.6 Some packages that paperless depends on are slowly dropping Python 3.6
@ -41,6 +38,13 @@ paperless-ng 1.1.4
If using docker, this does not affect you. If using docker, this does not affect you.
paperless-ng 1.1.4
##################
* Added English (GB) locale.
* Added ISO-8601 date display option.
paperless-ng 1.1.3 paperless-ng 1.1.3
################## ##################

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

@ -68,10 +68,10 @@ def _consume(filepath):
logger.exception("Error while consuming document") logger.exception("Error while consuming document")
def _consume_wait_unmodified(file, num_tries=20, wait_time=1): def _consume_wait_unmodified(file):
mtime = -1 mtime = -1
current_try = 0 current_try = 0
while current_try < num_tries: while current_try < settings.CONSUMER_POLLING_RETRY_COUNT:
try: try:
new_mtime = os.stat(file).st_mtime new_mtime = os.stat(file).st_mtime
except FileNotFoundError: except FileNotFoundError:
@ -82,7 +82,7 @@ def _consume_wait_unmodified(file, num_tries=20, wait_time=1):
_consume(file) _consume(file)
return return
mtime = new_mtime mtime = new_mtime
sleep(wait_time) sleep(settings.CONSUMER_POLLING_DELAY)
current_try += 1 current_try += 1
logger.error(f"Timeout while waiting on file {file} to remain unmodified.") logger.error(f"Timeout while waiting on file {file} to remain unmodified.")

7
src/documents/tests/test_management_consumer.py
View File

@ -203,7 +203,7 @@ class TestConsumer(DirectoriesMixin, ConsumerMixin, TransactionTestCase):
self.assertRaises(CommandError, call_command, 'document_consumer', '--oneshot') self.assertRaises(CommandError, call_command, 'document_consumer', '--oneshot')
@override_settings(CONSUMER_POLLING=1) @override_settings(CONSUMER_POLLING=1, CONSUMER_POLLING_DELAY=1, CONSUMER_POLLING_RETRY_COUNT=20)
class TestConsumerPolling(TestConsumer): class TestConsumerPolling(TestConsumer):
# just do all the tests with polling # just do all the tests with polling
pass pass
@ -215,8 +215,7 @@ class TestConsumerRecursive(TestConsumer):
pass pass
@override_settings(CONSUMER_RECURSIVE=True) @override_settings(CONSUMER_RECURSIVE=True, CONSUMER_POLLING=1, CONSUMER_POLLING_DELAY=1, CONSUMER_POLLING_RETRY_COUNT=20)
@override_settings(CONSUMER_POLLING=1)
class TestConsumerRecursivePolling(TestConsumer): class TestConsumerRecursivePolling(TestConsumer):
# just do all the tests with polling and recursive # just do all the tests with polling and recursive
pass pass
@ -257,6 +256,6 @@ class TestConsumerTags(DirectoriesMixin, ConsumerMixin, TransactionTestCase):
# their order. # their order.
self.assertCountEqual(kwargs["override_tag_ids"], tag_ids) self.assertCountEqual(kwargs["override_tag_ids"], tag_ids)
@override_settings(CONSUMER_POLLING=1) @override_settings(CONSUMER_POLLING=1, CONSUMER_POLLING_DELAY=1, CONSUMER_POLLING_RETRY_COUNT=20)
def test_consume_file_with_path_tags_polling(self): def test_consume_file_with_path_tags_polling(self):
self.test_consume_file_with_path_tags() self.test_consume_file_with_path_tags()

6
src/paperless/settings.py
View File

@ -425,6 +425,12 @@ THREADS_PER_WORKER = os.getenv("PAPERLESS_THREADS_PER_WORKER", default_threads_p
CONSUMER_POLLING = int(os.getenv("PAPERLESS_CONSUMER_POLLING", 0)) CONSUMER_POLLING = int(os.getenv("PAPERLESS_CONSUMER_POLLING", 0))
CONSUMER_POLLING_DELAY = int(os.getenv("PAPERLESS_CONSUMER_POLLING_DELAY", 5))
CONSUMER_POLLING_RETRY_COUNT = int(
os.getenv("PAPERLESS_CONSUMER_POLLING_RETRY_COUNT", 30 / CONSUMER_POLLING_DELAY)
)
CONSUMER_DELETE_DUPLICATES = __get_boolean("PAPERLESS_CONSUMER_DELETE_DUPLICATES") CONSUMER_DELETE_DUPLICATES = __get_boolean("PAPERLESS_CONSUMER_DELETE_DUPLICATES")
CONSUMER_RECURSIVE = __get_boolean("PAPERLESS_CONSUMER_RECURSIVE") CONSUMER_RECURSIVE = __get_boolean("PAPERLESS_CONSUMER_RECURSIVE")