|
34 | 34 |
|
35 | 35 | COMPONENTS_RESOURCE_TYPE = 'rclcpp_components' |
36 | 36 |
|
| 37 | +_LOG_LEVEL_MAP = { |
| 38 | + 'debug': rcl_interfaces.msg.LoggerLevel.LOG_LEVEL_DEBUG, |
| 39 | + 'info': rcl_interfaces.msg.LoggerLevel.LOG_LEVEL_INFO, |
| 40 | + 'warn': rcl_interfaces.msg.LoggerLevel.LOG_LEVEL_WARN, |
| 41 | + 'warning': rcl_interfaces.msg.LoggerLevel.LOG_LEVEL_WARN, |
| 42 | + 'error': rcl_interfaces.msg.LoggerLevel.LOG_LEVEL_ERROR, |
| 43 | + 'fatal': rcl_interfaces.msg.LoggerLevel.LOG_LEVEL_FATAL, |
| 44 | +} |
| 45 | + |
37 | 46 |
|
38 | 47 | def get_package_names_with_component_types(): |
39 | 48 | """Get the names of all packages that register component types in the ament index.""" |
@@ -230,7 +239,12 @@ def load_component_into_container( |
230 | 239 | if node_namespace is not None: |
231 | 240 | request.node_namespace = node_namespace |
232 | 241 | if log_level is not None: |
233 | | - request.log_level = log_level |
| 242 | + if log_level not in _LOG_LEVEL_MAP: |
| 243 | + raise RuntimeError( |
| 244 | + f"Invalid log level '{log_level}'. " |
| 245 | + 'Valid values are: debug, info, warn, error, fatal' |
| 246 | + ) |
| 247 | + request.log_level = _LOG_LEVEL_MAP[log_level] |
234 | 248 | if remap_rules is not None: |
235 | 249 | request.remap_rules = remap_rules |
236 | 250 | if parameters is not None: |
@@ -366,7 +380,11 @@ def add_component_arguments(parser): |
366 | 380 | argument.completer = ComponentTypeNameCompleter(package_name_key='package_name') |
367 | 381 | parser.add_argument('-n', '--node-name', help='Component node name') |
368 | 382 | parser.add_argument('--node-namespace', help='Component node namespace') |
369 | | - parser.add_argument('--log-level', help='Component node log level') |
| 383 | + parser.add_argument( |
| 384 | + '--log-level', type=str.lower, |
| 385 | + choices=['debug', 'info', 'warn', 'warning', 'error', 'fatal'], |
| 386 | + help='Component node log level (debug, info, warn, error, fatal)' |
| 387 | + ) |
370 | 388 | parser.add_argument( |
371 | 389 | '-r', '--remap-rule', action='append', dest='remap_rules', |
372 | 390 | help="Component node remapping rules, in the 'from:=to' form" |
|
0 commit comments