Rework Galaxy serve to wait using urllib instead of sockets.

jmchilton · jmchilton · commit 312921650b0f · 2017-03-16T11:47:06.000-04:00
That wait_for_net_service simply wasn't working with Mac OS X - at least in my hands. Maybe some difference with socket handling between BSD and Linux?
diff --git a/planemo/galaxy/serve.py b/planemo/galaxy/serve.py
@@ -49,14 +49,16 @@ def _serve(ctx, runnables, **kwds):
         if port is None:
             port = network_util.get_free_port()
 
+        timeout = 500
+        galaxy_url = "http://%s:%s" % (host, port)
         ctx.vlog("Waiting for service on (%s, %s)" % (host, port))
-        assert network_util.wait_net_service(host, port)
+        assert network_util.wait_http_service(galaxy_url, timeout=timeout)
         time.sleep(.1)
         ctx.vlog("Waiting for service on (%s, %s)" % (host, port))
-        assert network_util.wait_net_service(host, port)
+        assert network_util.wait_http_service(galaxy_url)
         time.sleep(5)
         ctx.vlog("Waiting for service on (%s, %s)" % (host, port))
-        assert network_util.wait_net_service(host, port)
+        assert network_util.wait_http_service(galaxy_url)
         config.install_workflows()
         return config
 
diff --git a/planemo/network_util.py b/planemo/network_util.py
@@ -1,6 +1,9 @@
 import socket
 from time import time as now
 
+from six.moves.urllib.error import URLError
+from six.moves.urllib.request import urlopen
+
 
 def get_free_port():
     sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
@@ -10,6 +13,24 @@ def get_free_port():
     return port
 
 
+def wait_http_service(url, timeout=None):
+    if timeout:
+        end = now() + timeout
+
+    while True:
+        try:
+            if timeout:
+                next_timeout = end - now()
+                if next_timeout < 0:
+                    return False
+
+            kwds = {} if timeout is None else dict(timeout=next_timeout)
+            urlopen(url, **kwds)
+            return True
+        except URLError:
+            pass
+
+
 # code.activestate.com/recipes/576655-wait-for-network-service-to-appear
 def wait_net_service(server, port, timeout=None):
     """ Wait for network service to appear
