Merge pull request #2638 from gurnec/pypy-ulimit-fix

close Popen() pipes explicitly for PyPy
pull/2651/head
Sergey G. Brester 2020-02-25 15:31:31 +01:00 committed by GitHub
commit 2e42b98cd3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions

View File

@ -32,6 +32,7 @@ ver. 0.10.6-dev (20??/??/??) - development edition
IPv6-capable now.
### Fixes
* restoring a large number (500+ depending on files ulimit) of current bans when using PyPy fixed
### New Features

View File

@ -260,7 +260,6 @@ class Utils():
if stdout is not None and stdout != '' and std_level >= logSys.getEffectiveLevel():
for l in stdout.splitlines():
logSys.log(std_level, "%x -- stdout: %r", realCmdId, uni_decode(l))
popen.stdout.close()
if popen.stderr:
try:
if retcode is None or retcode < 0:
@ -271,7 +270,9 @@ class Utils():
if stderr is not None and stderr != '' and std_level >= logSys.getEffectiveLevel():
for l in stderr.splitlines():
logSys.log(std_level, "%x -- stderr: %r", realCmdId, uni_decode(l))
popen.stderr.close()
if popen.stdout: popen.stdout.close()
if popen.stderr: popen.stderr.close()
success = False
if retcode in success_codes: