Cutlery/paperless-ngx
1
0
Fork 0
mirror of https://github.com/paperless-ngx/paperless-ngx.git synced 2025-11-03 19:17:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

Consumer loop: make sleep duration dynamic

Browse Source 
Make the sleep duration dynamic to account for the time spent in
loop_step.
This improves responsiveness when repeatedly consuming newly
arriving docs.

Use float epoch seconds (time.time()) as the time type for
MailFetcher.last_checked to allow for natural time arithmetic.
This commit is contained in:
Erik Arvstedt 2018-05-11 14:01:20 +02:00
parent bd75a65866
commit 7357471b9e
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/documents/mail.py
View File

@ -161,7 +161,7 @@ class MailFetcher(Loggable):
self._enabled = bool(self._host) self._enabled = bool(self._host)
self.last_checked = datetime.datetime.now() self.last_checked = time.time()
self.consume = consume self.consume = consume
def pull(self): def pull(self):
@ -188,7 +188,7 @@ class MailFetcher(Loggable):
f.write(message.attachment.data) f.write(message.attachment.data)
os.utime(file_name, times=(t, t)) os.utime(file_name, times=(t, t))
self.last_checked = datetime.datetime.now() self.last_checked = time.time()
def _get_messages(self): def _get_messages(self):

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

@ -59,7 +59,7 @@ class Command(BaseCommand):
self.verbosity = options["verbosity"] self.verbosity = options["verbosity"]
directory = options["directory"] directory = options["directory"]
loop_time = options["loop_time"] loop_time = options["loop_time"]
mail_delta = datetime.timedelta(minutes=options["mail_delta"]) mail_delta = options["mail_delta"] * 60
try: try:
self.file_consumer = Consumer(consume=directory) self.file_consumer = Consumer(consume=directory)
@ -83,18 +83,20 @@ class Command(BaseCommand):
def loop(self, loop_time, mail_delta): def loop(self, loop_time, mail_delta):
while True: while True:
self.loop_step(mail_delta) start_time = time.time()
time.sleep(loop_time)
if self.verbosity > 1: if self.verbosity > 1:
print(".", int(time.time())) print(".", int(start_time))
self.loop_step(mail_delta, start_time)
# Sleep until the start of the next loop step
time.sleep(max(0, start_time + loop_time - time.time()))
def loop_step(self, mail_delta): def loop_step(self, mail_delta, time_now=None):
# Occasionally fetch mail and store it to be consumed on the next loop # Occasionally fetch mail and store it to be consumed on the next loop
# We fetch email when we first start up so that it is not necessary to # We fetch email when we first start up so that it is not necessary to
# wait for 10 minutes after making changes to the config file. # wait for 10 minutes after making changes to the config file.
next_mail_time = self.mail_fetcher.last_checked + mail_delta next_mail_time = self.mail_fetcher.last_checked + mail_delta
if self.first_iteration or datetime.datetime.now() > next_mail_time: if self.first_iteration or time_now > next_mail_time:
self.first_iteration = False self.first_iteration = False
self.mail_fetcher.pull() self.mail_fetcher.pull()