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

Wrap ipv6 in [] when displaying/logging messages

Browse Source
This commit is contained in:
Simon Li
2025-01-26 16:22:15 +00:00
parent c7bb995f29
commit ec83356261
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
jupyterhub/objects.py
View File

@@ -219,4 +219,5 @@ class Hub(Server):
return url_path_join(self.url, 'api') return url_path_join(self.url, 'api')
def __repr__(self): def __repr__(self):
return f"<{self.__class__.__name__} {self.ip}:{self.port}>" ip = f"[{self.ip}]" if ":" in self.ip else self.ip
return f"<{self.__class__.__name__} {ip}:{self.port}>"

3
jupyterhub/orm.py
View File

@@ -157,7 +157,8 @@ class Server(Base):
spawner = relationship("Spawner", back_populates="server", uselist=False) spawner = relationship("Spawner", back_populates="server", uselist=False)
def __repr__(self): def __repr__(self):
return f"<Server({self.ip}:{self.port})>" ip = f"[{self.ip}]" if ":" in self.ip else self.ip
return f"<Server({ip}:{self.port})>"
# lots of things have roles # lots of things have roles

7
jupyterhub/utils.py
View File

@@ -269,15 +269,16 @@ async def wait_for_server(ip, port, timeout=10):
"""Wait for any server to show up at ip:port.""" """Wait for any server to show up at ip:port."""
if ip in {'', '0.0.0.0', '::'}: if ip in {'', '0.0.0.0', '::'}:
ip = '127.0.0.1' ip = '127.0.0.1'
app_log.debug("Waiting %ss for server at %s:%s", timeout, ip, port) display_ip = f"[{ip}]" if ":" in ip else ip
app_log.debug("Waiting %ss for server at %s:%s", timeout, display_ip, port)
tic = time.perf_counter() tic = time.perf_counter()
await exponential_backoff( await exponential_backoff(
lambda: can_connect(ip, port), lambda: can_connect(ip, port),
f"Server at {ip}:{port} didn't respond in {timeout} seconds", f"Server at {display_ip}:{port} didn't respond in {timeout} seconds",
timeout=timeout, timeout=timeout,
) )
toc = time.perf_counter() toc = time.perf_counter()
app_log.debug("Server at %s:%s responded in %.2fs", ip, port, toc - tic) app_log.debug("Server at %s:%s responded in %.2fs", display_ip, port, toc - tic)
async def wait_for_http_server(url, timeout=10, ssl_context=None): async def wait_for_http_server(url, timeout=10, ssl_context=None):