Skip to content

Commit 198575d

Browse files
committed
use hanging indent & more descriptive error message
Signed-off-by: Brian Chen <brian.chen@openrobotics.org>
1 parent 81ca3bb commit 198575d

2 files changed

Lines changed: 14 additions & 8 deletions

File tree

ros2param/ros2param/api/__init__.py

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@ def load_parameter_file(*, node, node_name, parameter_file, use_wildcard):
4444
client = AsyncParameterClient(node, node_name)
4545
ready = client.wait_for_services(timeout_sec=5.0)
4646
if not ready:
47-
raise RuntimeError('Wait for service timed out')
47+
raise RuntimeError(f'Wait for service timed out waiting for'
48+
'parameter services for node {node_name}')
4849
future = client.load_parameter_file(parameter_file, use_wildcard)
4950
parameters = list(parameter_dict_from_yaml_file(parameter_file, use_wildcard).values())
5051
rclpy.spin_until_future_complete(node, future)
@@ -69,7 +70,8 @@ def call_describe_parameters(*, node, node_name, parameter_names=None):
6970
client = AsyncParameterClient(node, node_name)
7071
ready = client.wait_for_services(timeout_sec=5.0)
7172
if not ready:
72-
raise RuntimeError('Wait for service timed out')
73+
raise RuntimeError(f'Wait for service timed out waiting for'
74+
'parameter services for node {node_name}')
7375
future = client.describe_parameters(parameter_names)
7476
rclpy.spin_until_future_complete(node, future)
7577
response = future.result()
@@ -83,7 +85,8 @@ def call_get_parameters(*, node, node_name, parameter_names):
8385
client = AsyncParameterClient(node, node_name)
8486
ready = client.wait_for_services(timeout_sec=5.0)
8587
if not ready:
86-
raise RuntimeError('Wait for service timed out')
88+
raise RuntimeError(f'Wait for service timed out waiting for'
89+
'parameter services for node {node_name}')
8790
future = client.get_parameters(parameter_names)
8891
rclpy.spin_until_future_complete(node, future)
8992
response = future.result()
@@ -97,7 +100,8 @@ def call_set_parameters(*, node, node_name, parameters):
97100
client = AsyncParameterClient(node, node_name)
98101
ready = client.wait_for_services(timeout_sec=5.0)
99102
if not ready:
100-
raise RuntimeError('Wait for service timed out')
103+
raise RuntimeError(f'Wait for service timed out waiting for'
104+
'parameter services for node {node_name}')
101105
future = client.set_parameters(parameters)
102106
rclpy.spin_until_future_complete(node, future)
103107
response = future.result()
@@ -111,7 +115,8 @@ def call_list_parameters(*, node, node_name, prefixes=None):
111115
client = AsyncParameterClient(node, node_name)
112116
ready = client.wait_for_services(timeout_sec=5.0)
113117
if not ready:
114-
raise RuntimeError('Wait for service timed out')
118+
raise RuntimeError(f'Wait for service timed out waiting for'
119+
'parameter services for node {node_name}')
115120
future = client.list_parameters(prefixes=prefixes)
116121
rclpy.spin_until_future_complete(node, future)
117122
response = future.result()

ros2param/ros2param/verb/list.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,10 @@ def main(self, *, args): # noqa: D102
7171
with DirectNode(args) as node:
7272
responses = {}
7373
for node_name in node_names:
74-
responses[node_name] = call_list_parameters(node=node,
75-
node_name=node_name.full_name,
76-
prefixes=args.param_prefixes)
74+
responses[node_name] = call_list_parameters(
75+
node=node,
76+
node_name=node_name.full_name,
77+
prefixes=args.param_prefixes)
7778
# print responses
7879
for node_name in sorted(responses.keys()):
7980
response = responses[node_name]

0 commit comments

Comments
 (0)