ClearML/wexpect-venv
1
0
Fork 0
mirror of https://github.com/clearml/wexpect-venv synced 2025-01-31 02:46:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[FIX] child logging

Browse Source
This commit is contained in:
Benedek Racz 2020-01-25 16:13:32 +01:00
parent e46ac7e108
commit 88bbd4fc5c
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
wexpect.py
View File

@ -1590,19 +1590,19 @@ class ConsoleReader: # pragma: no cover
def __init__(self, path, pid, tid, env = None, cp=None, logdir=None):
self.logdir = logdir
logger.debug('=' * 80, 'consolereader', logdir)
logger.debug("OEM code page: %s" % windll.kernel32.GetOEMCP(), 'consolereader', logdir)
logger.debug("ANSI code page: %s" % windll.kernel32.GetACP(), 'consolereader', logdir)
logger.debug("Console output code page: %s" % windll.kernel32.GetConsoleOutputCP(), 'consolereader', logdir)
logger.info('=' * 80)
logger.info("OEM code page: %s" % windll.kernel32.GetOEMCP())
logger.info("ANSI code page: %s" % windll.kernel32.GetACP())
logger.info("Console output code page: %s" % windll.kernel32.GetConsoleOutputCP())
if cp:
logger.debug("Setting console output code page to %s" % cp, 'consolereader', logdir)
logger.info("Setting console output code page to %s" % cp)
try:
win32console.SetConsoleOutputCP(cp)
except Exception as e:
logger.debug(e, 'consolereader', logdir)
logger.info(e)
else:
logger.debug("Console output code page: %s" % windll.kernel32.GetConsoleOutputCP(), 'consolereader', logdir)
logger.debug('Spawning %s' % path, 'consolereader', logdir)
logger.info("Console output code page: %s" % windll.kernel32.GetConsoleOutputCP())
logger.info('Spawning %s' % path)
try:
try:
consout = self.getConsoleOut()
@ -1612,7 +1612,7 @@ class ConsoleReader: # pragma: no cover
self.__childProcess, _, childPid, self.__tid = win32process.CreateProcess(None, path, None, None, False,
0, None, None, si)
except Exception as e:
logger.debug(e, 'consolereader', logdir)
logger.info(e)
time.sleep(.1)
win32api.PostThreadMessage(int(tid), win32con.WM_USER, 0, 0)
sys.exit()
@ -1638,7 +1638,7 @@ class ConsoleReader: # pragma: no cover
# Don't log. Child process will exit regardless when
# calling sys.exit
if e.args[0] != winerror.ERROR_ACCESS_DENIED:
logger.debug(e, 'consolereader', logdir)
logger.info(e)
sys.exit()
if cursorPos.Y > maxconsoleY and not paused:
@ -1651,12 +1651,12 @@ class ConsoleReader: # pragma: no cover
time.sleep(.1)
except Exception as e:
logger.debug(e, 'consolereader', logdir)
logger.info(e)
time.sleep(.1)
def handler(self, sig):
logger.debug(sig, 'consolereader', logdir)
logger.info(sig)
return False
def getConsoleOut(self):