BOSWatch/BW3-Core
1
0
Fork 0
mirror of https://github.com/BOSWatch/BW3-Core.git synced 2026-01-20 15:40:24 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix TypeError Exception in processManager

Browse source
This commit is contained in:
Bastian Schroll 2019-10-18 21:28:19 +02:00
parent 23aa2c7680
commit c1fed54a1b
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
boswatch/processManager.py
View file

@ -60,7 +60,7 @@ class ProcessManager:
universal_newlines=self._textMode,
shell=False)
if not self.isRunning:
logging.error("cannot start")
logging.error("cannot start process")
return False
logging.debug("process started with PID %d", self._processHandle.pid)
return True
@ -87,7 +87,6 @@ class ProcessManager:
line = self._processHandle.stdout.readline().strip()
except UnicodeDecodeError:
return None
return line
return None
@ -97,7 +96,7 @@ class ProcessManager:
@param lineCount: number of lines to skip
"""
logging.debug("skip %d lines from output", lineCount)
while lineCount:
while self.isRunning and lineCount:
self.readline()
lineCount -= 1
@ -106,10 +105,10 @@ class ProcessManager:
@param matchText: string to search for in output
"""
logging.debug("skip lines till %s from output", matchText)
logging.debug("skip lines till '%s' from output", matchText)
if not self._textMode:
matchText = bytes(matchText, "utf-8")
while matchText not in self.readline():
while self.isRunning and matchText not in self.readline():
pass
def setStdin(self, stdin):