mirror of https://github.com/apache/lucene.git
read both stderr and stdout from Solr example server
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1463314 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
9c67481b2c
commit
44b883aff4
|
@ -724,7 +724,7 @@ def readSolrOutput(p, startupEvent, failureEvent, logFile):
|
|||
f = open(logFile, 'wb')
|
||||
try:
|
||||
while True:
|
||||
line = p.stderr.readline()
|
||||
line = p.stdout.readline()
|
||||
if len(line) == 0:
|
||||
p.poll()
|
||||
if not startupEvent.isSet():
|
||||
|
@ -758,7 +758,7 @@ def testSolrExample(unpackPath, javaPath, isSrc):
|
|||
env.update(os.environ)
|
||||
env['JAVA_HOME'] = javaPath
|
||||
env['PATH'] = '%s/bin:%s' % (javaPath, env['PATH'])
|
||||
server = subprocess.Popen(['java', '-jar', 'start.jar'], stdout=subprocess.PIPE, stderr=subprocess.PIPE, stdin=subprocess.PIPE, env=env)
|
||||
server = subprocess.Popen(['java', '-jar', 'start.jar'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT, stdin=subprocess.PIPE, env=env)
|
||||
|
||||
startupEvent = threading.Event()
|
||||
failureEvent = threading.Event()
|
||||
|
|
Loading…
Reference in New Issue