diff runXena.py @ 34:a3fbe077a14c

replace wget with python method
author jingchunzhu <jingchunzhu@gmail.com>
date Thu, 23 Jul 2015 01:02:24 -0700
parents 7ceb967147c3
children
line wrap: on
line diff
--- a/runXena.py	Wed Jul 22 13:24:44 2015 -0700
+++ b/runXena.py	Thu Jul 23 01:02:24 2015 -0700
@@ -69,13 +69,14 @@
 handler.setFormatter(formatter)
 logger.addHandler(handler)
 
-hostname = subprocess.check_output("hostname -f", shell=True).rstrip()
+hostname = xena.hostname() #subprocess.check_output("hostname -f", shell=True).rstrip()
 
 #
 # Check if there has been a Xena running on this system, and  
 # what its port number is or was.
 #
 xenaPort = xena.port()
+
 if xenaPort == None:
     # In this case, no Xena has been running on this sytem.
     xenaIsRunning = False
@@ -91,6 +92,7 @@
     #
     if xenaIsRunning:
         fp.write("Xena VM currently running on http://%s:%s\n" % (hostname, xenaPort))
+        fp.write("\n")
         fp.write("You can add http://%s:%s to Xena Data Hub\n" % (hostname, xenaPort))
     else:
         fp.write("Xena VM is not currently running on %s\n" % (hostname))
@@ -105,9 +107,11 @@
     if not xenaIsRunning:
         xenaPort = xena.port(testIfAvailable=True, findNewPort=True)
         fp.write("Starting Xena VM on http://%s:%s\n" % (hostname, xenaPort))
-        fp.write("You can add http://%s:%s to Xena Data Hub\n" % (hostname, xenaPort))
+        fp.write("\n")
+        fp.write("Use Xena Administration -> Check Status tool to review status.\n")
     else:
         fp.write("Xena VM already running on http://%s:%s\n" % (hostname, xenaPort))
+        fp.write("\n")
         fp.write("You can add http://%s:%s to Xena Data Hub\n" % (hostname, xenaPort))
     fp.close()