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

wait for HTTP servers to start accepting requests

Browse Source 
avoids error messages in the proxy when servers are slow to start.
This commit is contained in:
MinRK
2014-10-14 14:39:53 -07:00
parent 2991468a32
commit 08fd76d1e8
2 changed files with 38 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
jupyterhub/orm.py
View File

@@ -26,7 +26,7 @@ from sqlalchemy import create_engine
from IPython.utils.py3compat import str_to_unicode
from .utils import random_port, url_path_join, wait_for_server
from .utils import random_port, url_path_join, wait_for_server, wait_for_http_server
def new_token(*args, **kwargs):
@@ -96,9 +96,12 @@ class Server(Base):
)
@gen.coroutine
def wait_up(self, timeout=10):
def wait_up(self, timeout=10, http=False):
"""Wait for this server to come up"""
yield wait_for_server(self.ip or 'localhost', self.port, timeout=timeout)
if http:
yield wait_for_http_server(self.url.replace('//*', '//localhost'), timeout=timeout)
else:
yield wait_for_server(self.ip or 'localhost', self.port, timeout=timeout)
def is_up(self):
"""Is the server accepting connections?"""
@@ -323,8 +326,8 @@ class User(Base):
self.state = spawner.get_state()
self.last_activity = datetime.utcnow()
db.commit()
yield self.server.wait_up()
yield self.server.wait_up(http=True)
raise gen.Return(self)
@gen.coroutine