Skip to content

Commit

Permalink
back-fixes for CARTA 1.4
Browse files Browse the repository at this point in the history
  • Loading branch information
o-smirnov committed Jun 3, 2021
1 parent 98b5858 commit fc506e3
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 1 addition & 1 deletion iglesia/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ def get_carta_url(*args):
url = f"http://localhost:{CARTA_PORT}"

if CARTA_VERSION < "2":
args = [f"socketUrl=ws://localhost:{CARTA_WS_PORT}"] + args
args = [f"socketUrl=ws://localhost:{CARTA_WS_PORT}"] + list(args)

if args:
return f"{url}?{'&'.join(args)}"
Expand Down
2 changes: 2 additions & 0 deletions radiopadre_client/remote.py
Original file line number Diff line number Diff line change
Expand Up @@ -314,6 +314,7 @@ def check_remote_command(command):
for _ in range(NUM_PORTS):
starting_port = find_unused_port(starting_port + 1, 10000)
ports.append(starting_port)
iglesia.set_userside_ports(ports)

remote_config["remote"] = ":".join(map(str, ports))

Expand Down Expand Up @@ -422,6 +423,7 @@ def check_remote_command(command):
iglesia.CARTA_VERSION = match.group(1)
if config.CARTA_BROWSER:
urls.append(iglesia.get_carta_url())
message(f"Remote CARTA version is {iglesia.CARTA_VERSION} ({config.CARTA_BROWSER})")
continue

if "jupyter notebook server is running" in line:
Expand Down

0 comments on commit fc506e3

Please sign in to comment.