burmatovan/openuds
1
0
Fork 0
forked from shaba/openuds
Code Issues Pull Requests Projects Releases Wiki Activity

:Merge branch 'master' of github.com:dkmstr/openuds

Browse Source
This commit is contained in:
Adolfo Gómez García 2021-06-23 16:17:31 +02:00
commit 4f45caa2e9
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
client-py3/full/src/uds/tools.py
View File

@ -176,11 +176,12 @@ def waitForTasks() -> None:
elif hasattr(task, 'wait'): elif hasattr(task, 'wait'):
task.wait() task.wait()
# If wait for spanwed process (look for process with task pid) and we can look for them... # If wait for spanwed process (look for process with task pid) and we can look for them...
logger.debug('Psutil: %s, waitForSubp: %s, hasattr: %s', psutil, waitForSubp, hasattr(task, 'pid'))
if psutil and waitForSubp and hasattr(task, 'pid'): if psutil and waitForSubp and hasattr(task, 'pid'):
subProcesses = list(filter( subProcesses = list(filter(
lambda x: x.ppid() == task.pid, psutil.process_iter(attrs=('ppid',)) lambda x: x.ppid() == task.pid, psutil.process_iter(attrs=('ppid',))
)) ))
logger.debug('Waiting for subprocesses... %s', task.pid, subProcesses) logger.debug('Waiting for subprocesses... %s, %s', task.pid, subProcesses)
for i in subProcesses: for i in subProcesses:
logger.debug('Found %s', i) logger.debug('Found %s', i)
i.wait() i.wait()