lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From thelabd...@apache.org
Subject svn commit: r1640419 - /lucene/dev/trunk/dev-tools/scripts/smokeTestRelease.py
Date Tue, 18 Nov 2014 20:30:37 GMT
Author: thelabdude
Date: Tue Nov 18 20:30:37 2014
New Revision: 1640419

URL: http://svn.apache.org/r1640419
Log:
SOLR-6708: wrap the kill existing Solr command in a try/except block

Modified:
    lucene/dev/trunk/dev-tools/scripts/smokeTestRelease.py

Modified: lucene/dev/trunk/dev-tools/scripts/smokeTestRelease.py
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/scripts/smokeTestRelease.py?rev=1640419&r1=1640418&r2=1640419&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/scripts/smokeTestRelease.py (original)
+++ lucene/dev/trunk/dev-tools/scripts/smokeTestRelease.py Tue Nov 18 20:30:37 2014
@@ -859,8 +859,13 @@ def testSolrExample(unpackPath, javaPath
   env.update(os.environ)
   env['JAVA_HOME'] = javaPath
   env['PATH'] = '%s/bin:%s' % (javaPath, env['PATH'])
+
   # Stop Solr running on port 8983 (in case a previous run didn't shutdown cleanly)
-  subprocess.call(['bin/solr','stop','-p','8983'])
+  try:
+      subprocess.call(['bin/solr','stop','-p','8983'])
+  except:
+      print('      Stop failed due to: '+sys.exc_info()[0])
+
   print('      starting Solr on port 8983 from %s' % unpackPath)
   server = subprocess.Popen(['bin/solr', '-f', '-p', '8983'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT,
stdin=subprocess.PIPE, env=env)
 



Mime
View raw message