hazza/jupyterhub
1
0
Fork 0
mirror of https://github.com/jupyterhub/jupyterhub.git synced 2025-10-19 16:03:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

return http response from wait_for_http_server

Browse Source
This commit is contained in:
Min RK
2017-06-07 12:38:56 +02:00
parent 0a30e0ade5
commit cdcc7fc3c1
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
jupyterhub/objects.py
View File

@@ -111,13 +111,12 @@ class Server(HasTraits):
return self.url.replace(self._connect_ip, self.ip or '*', 1) return self.url.replace(self._connect_ip, self.ip or '*', 1)
return self.url return self.url
@gen.coroutine
def wait_up(self, timeout=10, http=False): def wait_up(self, timeout=10, http=False):
"""Wait for this server to come up""" """Wait for this server to come up"""
if http: if http:
yield wait_for_http_server(self.url, timeout=timeout) return wait_for_http_server(self.url, timeout=timeout)
else: else:
yield wait_for_server(self._connect_ip, self.port, timeout=timeout) return wait_for_server(self._connect_ip, self.port, timeout=timeout)
def is_up(self): def is_up(self):
"""Is the server accepting connections?""" """Is the server accepting connections?"""

4
jupyterhub/utils.py
View File

@@ -89,13 +89,13 @@ def wait_for_http_server(url, timeout=10):
yield gen.sleep(0.1) yield gen.sleep(0.1)
else: else:
app_log.debug("Server at %s responded with %s", url, e.code) app_log.debug("Server at %s responded with %s", url, e.code)
return return e.response
except (OSError, socket.error) as e: except (OSError, socket.error) as e:
if e.errno not in {errno.ECONNABORTED, errno.ECONNREFUSED, errno.ECONNRESET}: if e.errno not in {errno.ECONNABORTED, errno.ECONNREFUSED, errno.ECONNRESET}:
app_log.warning("Failed to connect to %s (%s)", url, e) app_log.warning("Failed to connect to %s (%s)", url, e)
yield gen.sleep(0.1) yield gen.sleep(0.1)
else: else:
return return r
raise TimeoutError( raise TimeoutError(
"Server at {url} didn't respond in {timeout} seconds".format(**locals()) "Server at {url} didn't respond in {timeout} seconds".format(**locals())