YunoHost/moulinette
1
0
Fork 0
mirror of https://github.com/YunoHost/moulinette.git synced 2024-09-03 20:06:31 +02:00
Code Issues Projects Releases Packages Wiki Activity

Simplify AsynchronousFileReader by always use a File object

Browse source
This commit is contained in:
Augustin Trancart 2020-04-18 14:11:46 +02:00
parent ccda651298
commit eea79b62a3
1 changed files with 9 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
moulinette/utils/stream.py
View file

@ -1,8 +1,8 @@
import os import os
import time import time
from multiprocessing.process import BaseProcess as Process from multiprocessing.context import Process
from multiprocessing.queues import SimpleQueue from multiprocessing import SimpleQueue
# Read from a stream --------------------------------------------------- # Read from a stream ---------------------------------------------------
@ -33,39 +33,13 @@ class AsynchronousFileReader(Process):
# If self._fd is a file opened with open()... # If self._fd is a file opened with open()...
# Typically that's for stdout/stderr pipes # Typically that's for stdout/stderr pipes
# We can read the stuff easily with 'readline' # We can read the stuff easily by iterating it
if not isinstance(self._fd, int): # If self._fd has been opened with os.read, it will be an int
for line in iter(self._fd.readline, ""): # let's wrap it in a TextIOWrapper to be able to do the same
self._queue.put(line) if isinstance(self._fd, int):
self._fd = os.fdopen(self._fd)
# Else, it got opened with os.open() and we have to read it for line in self._fd:
# wit low level crap... self._queue.put(line)
else:
data = ""
while True:
try:
# Try to read (non-blockingly) a few bytes, append them to
# the buffer
data += os.read(self._fd, 50)
except Exception as e:
print(
"from moulinette.utils.stream: could not read file descriptor : %s"
% str(e)
)
continue
# If nobody's writing in there anymore, get out
if not data and os.fstat(self._fd).st_nlink == 0:
return
# If we have data, extract a line (ending with \n) and feed
# it to the consumer
if data and "\n" in data:
lines = data.split("\n")
self._queue.put(lines[0])
data = "\n".join(lines[1:])
else:
time.sleep(0.05)
def eof(self): def eof(self):
"""Check whether there is no more content to expect.""" """Check whether there is no more content to expect."""