Skip to content

Commit

Permalink
Add full dashboard link in scheduler logs (#7631)
Browse files Browse the repository at this point in the history
  • Loading branch information
milesgranger authored Mar 13, 2023
1 parent 6c85a0c commit 700f14a
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 3 deletions.
2 changes: 1 addition & 1 deletion distributed/node.py
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ def start_http_server(
bound_addresses = get_tcp_server_addresses(self.http_server)

# If more than one address is configured we just use the first here
self.http_server.port = bound_addresses[0][1]
self.http_server.address, self.http_server.port = bound_addresses[0]
self.services["dashboard"] = self.http_server

# Warn on port changes
Expand Down
10 changes: 8 additions & 2 deletions distributed/scheduler.py
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@
All,
TimeoutError,
empty_context,
format_dashboard_link,
get_fileno_limit,
key_split_group,
log_errors,
Expand Down Expand Up @@ -3860,8 +3861,13 @@ async def start_unsafe(self):

for listener in self.listeners:
logger.info(" Scheduler at: %25s", listener.contact_address)
for k, v in self.services.items():
logger.info("%11s at: %25s", k, "%s:%d" % (listen_ip, v.port))
for name, server in self.services.items():
if name == "dashboard":
addr = get_address_host(listener.contact_address)
link = format_dashboard_link(addr, server.port)
else:
link = f"{listen_ip}:{server.port}"
logger.info("%11s at: %25s", name, link)

if self.scheduler_file:
with open(self.scheduler_file, "w") as f:
Expand Down
1 change: 1 addition & 0 deletions distributed/tests/test_scheduler.py
Original file line number Diff line number Diff line change
Expand Up @@ -2870,6 +2870,7 @@ async def test_multiple_listeners():
log = log.getvalue()
assert re.search(r"Scheduler at:\s*tcp://", log)
assert re.search(r"Scheduler at:\s*inproc://", log)
assert re.search(r"dashboard at:\s*http://", log)


@gen_cluster(nthreads=[("127.0.0.1", 1)])
Expand Down

0 comments on commit 700f14a

Please sign in to comment.