niklas/ros2_tracing
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch '70-log-warn-if-shared-lib-cannot-be-found-by-ldpreload-action' into 'master'

Browse source 
Add logs for LdPreload action on success or failure

Closes #70

See merge request micro-ROS/ros_tracing/ros2_tracing!154
This commit is contained in:
Christophe Bedard 2020-03-07 19:02:13 +00:00
commit 3614312c4e
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
tracetools_launch/tracetools_launch/actions/ld_preload.py
View file

@ -19,6 +19,7 @@ from typing import List
from typing import Optional from typing import Optional
from typing import Union from typing import Union
from launch import logging
from launch.action import Action from launch.action import Action
from launch.actions import SetEnvironmentVariable from launch.actions import SetEnvironmentVariable
from launch.launch_context import LaunchContext from launch.launch_context import LaunchContext
@ -38,19 +39,23 @@ class LdPreload(Action):
""" """
Create an LdPreload action. Create an LdPreload action.
:param lib_name: the name of the library :param lib_name: the name of the library (e.g. 'lib.so')
""" """
super().__init__(**kwargs) super().__init__(**kwargs)
self.__lib_name = lib_name self.__lib_name = lib_name
self.__set_env_action = None self.__set_env_action = None
self.__logger = logging.get_logger(__name__)
# Try to find lib # Try to find lib
self.__lib_path = self.get_shared_lib_path(self.__lib_name) self.__lib_path = self.get_shared_lib_path(self.__lib_name)
# And create action if found # And create action if found
if self.__lib_path is not None: if self.__lib_path is not None:
self.__logger.debug(f'Shared library found at: {self.__lib_path}')
self.__set_env_action = SetEnvironmentVariable( self.__set_env_action = SetEnvironmentVariable(
self.ENV_VAR_LD_PRELOAD, self.ENV_VAR_LD_PRELOAD,
self.__lib_path, self.__lib_path,
) )
else:
self.__logger.warn(f'Could not find shared library: {self.__lib_name}')
def lib_found(self) -> bool: def lib_found(self) -> bool:
return self.__set_env_action is not None return self.__set_env_action is not None