31cfdbd407
Use eventlet.green.subprocess if eventlet is used and enable eventlet tests on Python 3. This change adds oslo_rootwrap.subprocess which is eventlet.green.subprocess if eventlet monkey-patching is enabled or if the TEST_EVENTLET environment variable is set, or subprocess of the Python standard library otherwise. When eventlet is used (with monkey-patching or not), it's more reliable to use eventlet.green.subprocess instead of using directly subprocess from the Python standard library. On Python 2, it "works" to use directly subprocess: subprocess.Popen calls os.pipe() and os.fdopen(fd) which are both monkey-patched. On Python 3, it doesn't work because subprocess uses os.pipe() and io.open(fd), and the io module is *not* monkey-patched at all. Change-Id: Ib859bebe52612b35f0f1f53aedf76222683795e7
58 lines
1.5 KiB
Python
58 lines
1.5 KiB
Python
# Copyright (c) 2014 Mirantis Inc.
|
|
# All Rights Reserved.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
import logging
|
|
import sys
|
|
import threading
|
|
|
|
from oslo_rootwrap import cmd
|
|
from oslo_rootwrap import subprocess
|
|
|
|
|
|
def forward_stream(fr, to):
|
|
while True:
|
|
line = fr.readline()
|
|
if not line:
|
|
break
|
|
to.write(line)
|
|
|
|
|
|
def forwarding_popen(f, old_popen=subprocess.Popen):
|
|
def popen(*args, **kwargs):
|
|
p = old_popen(*args, **kwargs)
|
|
t = threading.Thread(target=forward_stream, args=(p.stderr, f))
|
|
t.daemon = True
|
|
t.start()
|
|
return p
|
|
return popen
|
|
|
|
|
|
class nonclosing(object):
|
|
def __init__(self, f):
|
|
self._f = f
|
|
|
|
def __getattr__(self, name):
|
|
return getattr(self._f, name)
|
|
|
|
def close(self):
|
|
pass
|
|
|
|
log_format = ("%(asctime)s | [%(process)5s]+%(levelname)5s | "
|
|
"%(message)s")
|
|
if __name__ == '__main__':
|
|
logging.basicConfig(level=logging.DEBUG, format=log_format)
|
|
sys.stderr = nonclosing(sys.stderr)
|
|
cmd.daemon()
|